Mercurial > emacs
changeset 105788:fedd4c047ce7
(pcomplete-comint-setup): If there's a choice, replace
shell-dynamic-complete-filename in preference to
comint-dynamic-complete-filename.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 28 Oct 2009 13:59:30 +0000 |
| parents | d5f02d259103 |
| children | 6df5ff499103 |
| files | lisp/ChangeLog lisp/pcomplete.el |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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))))