[Emacs-diffs] emacs/lisp ChangeLog pcomplete.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/28 13:59:35

Modified files:
        lisp           : ChangeLog pcomplete.el 

Log message:
        (pcomplete-comint-setup): If there's a choice, replace
        shell-dynamic-complete-filename in preference to
        comint-dynamic-complete-filename.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16519&r2=1.16520
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pcomplete.el?cvsroot=emacs&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16519
retrieving revision 1.16520
diff -u -b -r1.16519 -r1.16520
--- ChangeLog   28 Oct 2009 03:09:11 -0000      1.16519
+++ ChangeLog   28 Oct 2009 13:59:30 -0000      1.16520
@@ -1,5 +1,9 @@
 2009-10-28  Stefan Monnier  <address@hidden>
 
+       * 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.

Index: pcomplete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcomplete.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- pcomplete.el        26 Oct 2009 04:06:05 -0000      1.44
+++ pcomplete.el        28 Oct 2009 13:59:34 -0000      1.45
@@ -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))))