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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/14 15:10:37

Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- minibuffer.el       14 Apr 2008 03:39:31 -0000      1.11
+++ minibuffer.el       14 Apr 2008 15:10:36 -0000      1.12
@@ -131,14 +131,19 @@
 
 (defun completion-table-with-terminator (terminator table string pred action)
   (let ((comp (complete-with-action action table string pred)))
-    (if (eq action nil)
+    (cond
+     ((eq action nil)
         (if (eq comp t)
             (concat string terminator)
           (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.
+     ((eq action 'lambda) nil))))
 
 (defun completion-table-in-turn (&rest tables)
   "Create a completion table that tries each table in TABLES in turn."
@@ -707,8 +712,11 @@
                   (if (funcall pred tem) (push tem comp))))
               (setq all (nreverse comp))))
 
+          (if (and completion-all-completions-with-base-size (consp all))
           ;; Add base-size, but only if the list is non-empty.
-          (if (consp all) (nconc all base-size))))
+              (nconc all base-size))
+
+          all))
 
        (t
         ;; Only other case actually used is ACTION = lambda.