From: Glenn Morris <rgm@gnu.org>
Date: Thu, 15 Nov 2012 07:59:46 +0000 (-0800)
Subject: * lisp/eshell/em-cmpl.el (eshell-pcomplete): New command.
X-Git-Tag: emacs-24.2.90~78
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17c083ac218b2a560b84a11df22366c0b9f7b636;p=emacs.git

* lisp/eshell/em-cmpl.el (eshell-pcomplete): New command.
(eshell-cmpl-initialize): Bind eshell-pcomplete to TAB, C-i.

Fixes: debbugs:12838
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e53b667b2b2..74981d0c241 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-11-15  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index a67861e83a9..aa8aae2d245 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -295,8 +295,8 @@ to writing a completion function."
     '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 @@ to writing a completion function."
 			(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: