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

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/12/16 01:24:26

Index: ido.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ido.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- ido.el      10 Dec 2006 23:58:23 -0000      1.117
+++ ido.el      16 Dec 2006 01:24:26 -0000      1.118
@@ -3729,7 +3729,8 @@
          (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 @@
        (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)