# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1256738370 0
# Node ID fedd4c047ce757c912195442777d84514766dd16
# Parent  d5f02d259103972928387bd73b0815fad889dae9
(pcomplete-comint-setup): If there's a choice, replace
shell-dynamic-complete-filename in preference to
comint-dynamic-complete-filename.

diff -r d5f02d259103 -r fedd4c047ce7 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 28 03:09:11 2009 +0000
+++ b/lisp/ChangeLog	Wed Oct 28 13:59:30 2009 +0000
@@ -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 -r d5f02d259103 -r fedd4c047ce7 lisp/pcomplete.el
--- a/lisp/pcomplete.el	Wed Oct 28 03:09:11 2009 +0000
+++ b/lisp/pcomplete.el	Wed Oct 28 13:59:30 2009 +0000
@@ -775,8 +775,8 @@
   (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))))