[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110874: * lisp/eshell/em-cmpl.el (eshell-pcomplete): New command.

[Glenn Morris]

------------------------------------------------------------
revno: 110874
fixes bug: http://debbugs.gnu.org/12838
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-11-14 23:59:46 -0800
message:
  * lisp/eshell/em-cmpl.el (eshell-pcomplete): New command. 
  (eshell-cmpl-initialize): Bind eshell-pcomplete to TAB, C-i.
modified:
  lisp/ChangeLog
  lisp/eshell/em-cmpl.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-15 07:30:46 +0000
+++ b/lisp/ChangeLog    2012-11-15 07:59:46 +0000
@@ -1,5 +1,8 @@
 2012-11-15  Glenn Morris  <address@hidden>
 
+       * eshell/em-cmpl.el (eshell-pcomplete): New command.  (Bug#12838)
+       (eshell-cmpl-initialize): Bind eshell-pcomplete to TAB, C-i.
+
        * faces.el (face-underline-p): Doc fix.  Handle :underline being
        things other than `t' (a string, a list).
        (face-inverse-video-p): Doc fix.

=== modified file 'lisp/eshell/em-cmpl.el'
--- a/lisp/eshell/em-cmpl.el    2012-07-11 23:13:41 +0000
+++ b/lisp/eshell/em-cmpl.el    2012-11-15 07:59:46 +0000
@@ -295,8 +295,8 @@
     'pcomplete-expand-and-complete)
   (define-key eshell-command-map [space] 'pcomplete-expand)
   (define-key eshell-command-map [? ] 'pcomplete-expand)
-  (define-key eshell-mode-map [tab] 'pcomplete)
-  (define-key eshell-mode-map [(control ?i)] 'pcomplete)
+  (define-key eshell-mode-map [tab] 'eshell-pcomplete)
+  (define-key eshell-mode-map [(control ?i)] 'eshell-pcomplete)
   ;; jww (1999-10-19): Will this work on anything but X?
   (if (featurep 'xemacs)
       (define-key eshell-mode-map [iso-left-tab] 'pcomplete-reverse)
@@ -449,6 +449,13 @@
                        (all-completions filename obarray 'functionp))
                   completions)))))))
 
+(defun eshell-pcomplete ()
+  "Eshell wrapper for `pcomplete'."
+  (interactive)
+  (if eshell-cmpl-ignore-case
+      (pcomplete-expand-and-complete)  ; hack workaround for bug#12838
+    (pcomplete)))
+
 (provide 'em-cmpl)
 
 ;; Local Variables: