summaryrefslogtreecommitdiff
path: root/lisp/minibuffer.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-05-22 04:26:41 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-05-22 04:26:41 +0000
commitc63028e1b49f5176b2838c85d90fc1ad3d84f3f0 (patch)
tree5a65c7116a504e315e3bd72a896ce32b2be816ce /lisp/minibuffer.el
parenta30e19579a56b2574efc89881d470f378d1d0d8f (diff)
downloademacs-c63028e1b49f5176b2838c85d90fc1ad3d84f3f0.tar.gz
(completion-pcm--find-all-completions): Don't add pseudo-completions.
Diffstat (limited to 'lisp/minibuffer.el')
-rw-r--r--lisp/minibuffer.el17
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 59081b8d269..f8d7a15a69f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -48,7 +48,6 @@
;; - add support for ** to pcm.
;; - Make read-file-name-predicate obsolete.
-;; - New command minibuffer-force-complete that chooses one of all-completions.
;; - Add vc-file-name-completion-table to read-file-name-internal.
;; - A feature like completing-help.el.
;; - Make the `hide-spaces' arg of all-completions obsolete?
@@ -1476,12 +1475,16 @@ PATTERN is as returned by `completion-pcm--string->pattern'."
(concat subprefix submatch between)
pattern table pred))
all)))
- (unless all
- ;; Even though we found expansions in the prefix, none
- ;; leads to a valid completion.
- ;; Let's keep the expansions, tho.
- (dolist (submatch suball)
- (push (concat submatch between newsubstring) all)))))
+ ;; FIXME: This can come in handy for try-completion,
+ ;; but isn't right for all-completions, since it lists
+ ;; invalid completions.
+ ;; (unless all
+ ;; ;; Even though we found expansions in the prefix, none
+ ;; ;; leads to a valid completion.
+ ;; ;; Let's keep the expansions, tho.
+ ;; (dolist (submatch suball)
+ ;; (push (concat submatch between newsubstring) all)))
+ ))
(setq pattern (append subpat (list 'any (string sep))
(if between (list between)) pattern))
(setq prefix subprefix)))))