(icomplete-completions): While collecting the list of prospective candidates,

don't overshoot `icomplete-prospects-length'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a812405fd1a4a7a020fde8cfdd9a545f7246ac98..75dbbd5a06897191fb26848a29ed63ca3a5152d3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,8 @@
        (icomplete-compute-delay): Fix docstring and remove spurious *.
        (icomplete-delay-completions-threshold): Fix typo in docstring and
        remove spurious *.
+       (icomplete-completions): While collecting the list of prospective
+       candidates, don't overshoot `icomplete-prospects-length'.
 
 2008-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
 

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 780fca207096328407dd7eb67b1fe120f3a00b22..ce35a6c960df24dda0f8e1627aa11bb0e6972924 100644 (file)
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -299,17 +299,19 @@ are exhibited within the square braces.)"
                                  (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
                    "{"