[Emacs-diffs] Changes to emacs/lisp/minibuffer.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/22 04:26:42

Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- minibuffer.el       21 May 2008 20:52:44 -0000      1.41
+++ minibuffer.el       22 May 2008 04:26:41 -0000      1.42
@@ -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 @@
                                        (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)))))