Mercurial > emacs
changeset 94172:8cc638ca5be4
(completion-table-with-terminator): Fix last fix.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 18 Apr 2008 12:46:14 +0000 |
parents | 2fbc17405045 |
children | f062aad7dc37 |
files | lisp/ChangeLog lisp/minibuffer.el |
diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Apr 18 11:04:56 2008 +0000 +++ b/lisp/ChangeLog Fri Apr 18 12:46:14 2008 +0000 @@ -1,3 +1,7 @@ +2008-04-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * minibuffer.el (completion-table-with-terminator): Fix last fix. + 2008-04-18 Andreas Schwab <schwab@suse.de> * Makefile.in ($(MH_E_DIR)/mh-loaddefs.el): Depend on
--- a/lisp/minibuffer.el Fri Apr 18 11:04:56 2008 +0000 +++ b/lisp/minibuffer.el Fri Apr 18 12:46:14 2008 +0000 @@ -25,10 +25,8 @@ ;; are meant to be for internal use only. ;; TODO: -;; - make the `hide-spaces' arg of all-completions obsolete. - -;; BUGS: -;; - envvar completion for file names breaks completion-base-size. +;; - New command minibuffer-force-complete that chooses one of all-completions. +;; - make the `hide-spaces' arg of all-completions obsolete? ;;; Code: @@ -138,8 +136,7 @@ (if (and (stringp comp) (eq (complete-with-action action table comp pred) t)) (concat comp terminator) - comp) - comp)) + comp))) ;; completion-table-with-terminator is always used for ;; "sub-completions" so it's only called if the terminator is missing, ;; in which case `test-completion' should return nil.