[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111110: * eshell/em-cmpl.el (eshell-pcomplete): More thoroughly imitate pcomplete.

[Glenn Morris]

------------------------------------------------------------
revno: 111110
fixes bug: http://debbugs.gnu.org/13293
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-12-31 13:28:33 -0800
message:
  * eshell/em-cmpl.el (eshell-pcomplete): More thoroughly imitate pcomplete.
modified:
  lisp/ChangeLog
  lisp/eshell/em-cmpl.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-31 21:20:07 +0000
+++ b/lisp/ChangeLog    2012-12-31 21:28:33 +0000
@@ -1,5 +1,8 @@
 2012-12-31  Glenn Morris  <address@hidden>
 
+       * eshell/em-cmpl.el (eshell-pcomplete):
+       More thoroughly imitate pcomplete.  (Bug#13293)
+
        * files.el (parse-colon-path): Doc fix.  (Bug#12351)
        Return nil for empty path elements.  (Bug#13296)
 

=== modified file 'lisp/eshell/em-cmpl.el'
--- a/lisp/eshell/em-cmpl.el    2012-11-19 19:22:07 +0000
+++ b/lisp/eshell/em-cmpl.el    2012-12-31 21:28:33 +0000
@@ -451,11 +451,15 @@
                        (all-completions filename obarray 'functionp))
                   completions)))))))
 
-(defun eshell-pcomplete ()
+(defun eshell-pcomplete (&optional interactively)
   "Eshell wrapper for `pcomplete'."
-  (interactive)
+  (interactive "p")
+  ;; Pretend to be pcomplete so that cycling works (bug#13293).
+  (setq this-command 'pcomplete)
   (condition-case nil
-      (pcomplete)
+      (if interactively
+         (call-interactively 'pcomplete)
+       (pcomplete))
     (text-read-only (completion-at-point)))) ; Workaround for bug#12838.
 
 (provide 'em-cmpl)