(completion-table-with-terminator): Fix last fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7866ef8c59150c22aaa7a1c2429c19e6c0ac6d49..11823e65c634f0072ca2ed78364dc0aa62c32fb0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 2adb4c3e7f9974f299e3122d7e3ec1ac03b33684..834aa589f2df89079a79488154a07b882d639437 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -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 @@ You should give VAR a non-nil `risky-local-variable' property."
         (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.