]> git.eshelyaron.com Git - emacs.git/commitdiff
(ido-completion-help): Build ido-cur-list and ido-matches
authorKim F. Storm <storm@cua.dk>
Sat, 16 Dec 2006 01:24:26 +0000 (01:24 +0000)
committerKim F. Storm <storm@cua.dk>
Sat, 16 Dec 2006 01:24:26 +0000 (01:24 +0000)
if ido-directory-too-big is set on entry.

lisp/ido.el

index 796c377571ced54eccaba93a9ad37ad2126b5a01..6a38e0b57de887f7d7643767e76f49b6a1756cd8 100644 (file)
@@ -3729,7 +3729,8 @@ for first matching file."
          (set-buffer temp-buf)
          (setq win (get-buffer-window temp-buf))
          (if (pos-visible-in-window-p (point-max) win)
-             (if (or ido-completion-buffer-all-completions (boundp 'ido-completion-buffer-full))
+             (if (or ido-completion-buffer-all-completions
+                     (boundp 'ido-completion-buffer-full))
                  (set-window-start win (point-min))
                (with-no-warnings
                  (set (make-local-variable 'ido-completion-buffer-full) t))
@@ -3742,6 +3743,13 @@ for first matching file."
        (with-output-to-temp-buffer ido-completion-buffer
          (let ((completion-list (sort
                                  (cond
+                                  (ido-directory-too-big
+                                   (setq ido-directory-too-big nil
+                                         ido-ignored-list nil
+                                         ido-cur-list (ido-all-completions)
+                                         ido-rescan t)
+                                   (ido-set-matches)
+                                   (or ido-matches ido-cur-list))
                                   (ido-use-merged-list
                                    (ido-flatten-merged-list (or ido-matches ido-cur-list)))
                                   ((or full-list ido-completion-buffer-all-completions)