summaryrefslogtreecommitdiff
path: root/lisp/ido.el
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2006-12-16 01:24:26 +0000
committerKim F. Storm <storm@cua.dk>2006-12-16 01:24:26 +0000
commitc05b06127d01516ae078ec2134c73b770d800789 (patch)
tree732a88655b12f5e407ec10cc6e9fa230ae4b637b /lisp/ido.el
parent6e5af5e5c18b99891e8cf683793ecd2916251a8f (diff)
downloademacs-c05b06127d01516ae078ec2134c73b770d800789.tar.gz
(ido-completion-help): Build ido-cur-list and ido-matches
if ido-directory-too-big is set on entry.
Diffstat (limited to 'lisp/ido.el')
-rw-r--r--lisp/ido.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ido.el b/lisp/ido.el
index 796c377571c..6a38e0b57de 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -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)