[Emacs-diffs] /srv/bzr/emacs/trunk r106763: Fix shell completion regression.

[Chong Yidong]

------------------------------------------------------------
revno: 106763
fixes bug(s): http://debbugs.gnu.org/10417
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-03 14:31:08 +0800
message:
  Fix shell completion regression.
  
  * lisp/shell.el (shell-dynamic-complete-functions): Put
  pcomplete-completions-at-point, so as to try
  comint-filename-completion first (Bug#10417).
modified:
  lisp/ChangeLog
  lisp/shell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-03 02:14:40 +0000
+++ b/lisp/ChangeLog    2012-01-03 06:31:08 +0000
@@ -1,3 +1,9 @@
+2012-01-03  Chong Yidong  <address@hidden>
+
+       * shell.el (shell-dynamic-complete-functions): Put
+       pcomplete-completions-at-point, so as to try
+       comint-filename-completion first (Bug#10417).
+
 2012-01-02  Richard Stallman  <address@hidden>
 
        * battery.el (battery-status-function):

=== modified file 'lisp/shell.el'
--- a/lisp/shell.el     2012-01-02 09:27:32 +0000
+++ b/lisp/shell.el     2012-01-03 06:31:08 +0000
@@ -187,10 +187,11 @@
     shell-environment-variable-completion
     shell-command-completion
     shell-c-a-p-replace-by-expanded-directory
-    pcomplete-completions-at-point
     shell-filename-completion
-    ;; Not sure when this one would still be useful.  --Stef
-    comint-filename-completion)
+    comint-filename-completion
+    ;; This goes last, so that `comint-filename-completion' can handle
+    ;; `shell-completion-execonly' (Bug#10417).
+    pcomplete-completions-at-point)
   "List of functions called to perform completion.
 This variable is used to initialize `comint-dynamic-complete-functions' in the
 shell buffer.