From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 22 May 2008 04:26:41 +0000 (+0000)
Subject: (completion-pcm--find-all-completions): Don't add pseudo-completions.
X-Git-Tag: emacs-pretest-23.0.90~5365
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c63028e1b49f5176b2838c85d90fc1ad3d84f3f0;p=emacs.git

(completion-pcm--find-all-completions): Don't add pseudo-completions.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d95e7db89a..559a0e4f0c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* minibuffer.el (completion-pcm--find-all-completions):
+	Don't add pseudo-completions.
+
 	* icomplete.el (icomplete-eoinput): Remove.
 	(icomplete-overlay): New var to replace it.
 	(icomplete-tidy): Rewrite.
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)))))