From: Stefan Monnier Date: Wed, 28 Oct 2009 13:59:30 +0000 (+0000) Subject: (pcomplete-comint-setup): If there's a choice, replace X-Git-Tag: emacs-pretest-23.1.90~631 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70f44c655cee05550fa1cfcd0aae5cf720c31447;p=emacs.git (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 76abefb31ff..7c05d4406d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2009-10-28 Stefan Monnier + * 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))))