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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Chong Yidong <cyd>      09/07/12 16:22:06

Modified files:
        lisp           : ChangeLog pcomplete.el 

Log message:
        * pcomplete.el (pcomplete-comint-setup): Check for
        shell-dynamic-complete-filename too.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.15702.2.24&r2=1.15702.2.25
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pcomplete.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.39&r2=1.39.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15702.2.24
retrieving revision 1.15702.2.25
diff -u -b -r1.15702.2.24 -r1.15702.2.25
--- ChangeLog   11 Jul 2009 06:25:10 -0000      1.15702.2.24
+++ ChangeLog   12 Jul 2009 16:22:00 -0000      1.15702.2.25
@@ -1,3 +1,8 @@
+2009-07-12  Guanpeng Xu  <address@hidden>
+
+       * pcomplete.el (pcomplete-comint-setup): Check for
+       shell-dynamic-complete-filename too.
+
 2009-07-11  Kenichi Handa  <address@hidden>
 
        * international/mule-diag.el (describe-character-set): Don't show

Index: pcomplete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcomplete.el,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -b -r1.39 -r1.39.2.1
--- pcomplete.el        5 Jan 2009 03:19:38 -0000       1.39
+++ pcomplete.el        12 Jul 2009 16:22:06 -0000      1.39.2.1
@@ -590,8 +590,9 @@
   (set (make-local-variable 'pcomplete-parse-arguments-function)
        'pcomplete-parse-comint-arguments)
   (make-local-variable completef-sym)
-  (let ((elem (memq 'comint-dynamic-complete-filename
-                   (symbol-value completef-sym))))
+  (let* ((funs (symbol-value completef-sym))
+        (elem (or (memq 'comint-dynamic-complete-filename funs)
+                  (memq 'shell-dynamic-complete-filename funs))))
     (if elem
        (setcar elem 'pcomplete)
       (add-to-list completef-sym 'pcomplete))))