aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/minibuffer.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09c00ee2c89..713da5a6d12 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-04-17 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuffer.el (completion-table-with-terminator): Fix paren typo.
4
12008-04-17 Sam Steingold <sds@gnu.org> 52008-04-17 Sam Steingold <sds@gnu.org>
2 6
3 * pcvs-util.el (cvs-bury-buffer): Use quit-window instead of the 7 * pcvs-util.el (cvs-bury-buffer): Use quit-window instead of the
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 2fec4238230..77a84e065e3 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -138,8 +138,8 @@ You should give VAR a non-nil `risky-local-variable' property."
138 (if (and (stringp comp) 138 (if (and (stringp comp)
139 (eq (complete-with-action action table comp pred) t)) 139 (eq (complete-with-action action table comp pred) t))
140 (concat comp terminator) 140 (concat comp terminator)
141 comp)) 141 comp)
142 comp) 142 comp))
143 ;; completion-table-with-terminator is always used for 143 ;; completion-table-with-terminator is always used for
144 ;; "sub-completions" so it's only called if the terminator is missing, 144 ;; "sub-completions" so it's only called if the terminator is missing,
145 ;; in which case `test-completion' should return nil. 145 ;; in which case `test-completion' should return nil.