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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/20 13:44:50

Index: icomplete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/icomplete.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- icomplete.el        20 May 2008 03:36:20 -0000      1.52
+++ icomplete.el        20 May 2008 13:44:50 -0000      1.53
@@ -291,13 +291,14 @@
     ;; `icomplete-prospects-length', there is no need for `catch'/`throw'.
     (if (null comps)
         (format " %sNo matches%s" open-bracket close-bracket)
-      (let* ((most-try (completion-try-completion
-                        name
+      (let* ((most-try
+              (if (and base-size (> base-size 0))
+                  (completion-try-completion
+                   name candidates predicate (length name))
                        ;; If the `comps' are 0-based, the result should be
                        ;; the same with `comps'.
-                        (if base-size candidates comps)
-                        predicate
-                        (length name)))
+                (completion-try-completion
+                 name comps nil (length name))))
             (most (if (consp most-try) (car most-try) (car comps)))
              ;; Compare name and most, so we can determine if name is
              ;; a prefix of most, or something else.