(pcomplete-comint-setup): If there's a choice, replace

shell-dynamic-complete-filename in preference to
comint-dynamic-complete-filename.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76abefb31ff9db044aaec0d03ed7a21a911f80db..7c05d4406d8795e8268a85b32835b4b2a4f5672f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * pcomplete.el (pcomplete-comint-setup): If there's a choice, replace
+       shell-dynamic-complete-filename in preference to
+       comint-dynamic-complete-filename.
+
        * bookmark.el (bookmark-insert-location, bookmark-bmenu-list)
        (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames):
        Don't consider whether the display supports colors.

diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index f0296532ca967582331dc7b6258c42832d99a051..65b48f49fa9df62a7661dbf39e6c3b42e474a156 100644 (file)
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -775,8 +775,8 @@ this is `comint-dynamic-complete-functions'."
   (set (make-local-variable completef-sym)
        (copy-sequence (symbol-value completef-sym)))
   (let* ((funs (symbol-value completef-sym))
-        (elem (or (memq 'comint-dynamic-complete-filename funs)
-                  (memq 'shell-dynamic-complete-filename funs))))
+        (elem (or (memq 'shell-dynamic-complete-filename funs)
+                  (memq 'comint-dynamic-complete-filename funs))))
     (if elem
        (setcar elem 'pcomplete)
       (add-to-list completef-sym 'pcomplete))))