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

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

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76abefb31ff..7c05d4406d8 100644
--- 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 f0296532ca9..65b48f49fa9 100644
--- 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))))