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

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/03/20 10:28:11

Index: icomplete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/icomplete.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- icomplete.el        20 Mar 2008 09:15:47 -0000      1.49
+++ icomplete.el        20 Mar 2008 10:28:11 -0000      1.50
@@ -299,17 +299,19 @@
                                  (substring most (length name))
                                  close-bracket-determined)))
             ;;"-prospects" - more than one candidate
-            (prospects-len 0)
-            prospects most-is-exact comp)
+            (prospects-len (+ (length determ) 6)) ;; take {,...} into account
+            prospects most-is-exact comp limit)
        (if (eq most-try t)
            (setq prospects nil)
-         (while (and comps (< prospects-len icomplete-prospects-length))
+         (while (and comps (not limit))
            (setq comp (substring (car comps) most-len)
                  comps (cdr comps))
            (cond ((string-equal comp "") (setq most-is-exact t))
                  ((member comp prospects))
-                 (t (setq prospects (cons comp prospects)
-                          prospects-len (+ (length comp) 1 prospects-len))))))
+                 (t (setq prospects-len (+ (length comp) 1 prospects-len))
+                    (if (< prospects-len icomplete-prospects-length)
+                        (setq prospects (cons comp prospects))
+                      (setq limit t))))))
        (if prospects
            (concat determ
                    "{"