[Emacs-diffs] /srv/bzr/emacs/trunk r102832: * ido.el (ido-may-cache-directory): Move "too-big" check later.

[Kim F. Storm]

------------------------------------------------------------
revno: 102832
committer: Kim F. Storm <address@hidden>
branch nick: trunk
timestamp: Thu 2011-01-13 17:26:40 +0100
message:
  * ido.el (ido-may-cache-directory): Move "too-big" check later.
  (ido-next-match, ido-prev-match): Fix stray reordering of matching
  items when cycling through the matches.
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-13 15:44:41 +0000
+++ b/lisp/ChangeLog    2011-01-13 16:26:40 +0000
@@ -1,3 +1,9 @@
+2011-01-13  Kim F. Storm  <address@hidden>
+
+       * ido.el (ido-may-cache-directory): Move "too-big" check later.
+       (ido-next-match, ido-prev-match): Fix stray reordering of matching
+       items when cycling through the matches.
+
 2011-01-13  Tassilo Horn  <address@hidden>
 
        * dired-x.el (dired-omit-verbose): New defcustom that allows

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2010-12-17 10:56:03 +0000
+++ b/lisp/ido.el       2011-01-13 16:26:40 +0000
@@ -1289,8 +1289,6 @@
 (defun ido-may-cache-directory (&optional dir)
   (setq dir (or dir ido-current-directory))
   (cond
-   ((ido-directory-too-big-p dir)
-    nil)
    ((and (ido-is-root-directory dir)
         (or ido-enable-tramp-completion
             (memq system-type '(windows-nt ms-dos))))
@@ -1299,6 +1297,8 @@
     (ido-cache-unc-valid))
    ((ido-is-ftp-directory dir)
     (ido-cache-ftp-valid))
+   ((ido-directory-too-big-p dir)
+    nil)
    (t t)))
 
 (defun ido-pp (list &optional sep)
@@ -3072,8 +3072,8 @@
   (if ido-matches
       (let ((next (cadr ido-matches)))
        (setq ido-cur-list (ido-chop ido-cur-list next))
-       (setq ido-rescan t)
-       (setq ido-rotate t))))
+       (setq ido-matches (ido-chop ido-matches next))
+       (setq ido-rescan nil))))
 
 (defun ido-prev-match ()
   "Put last element of `ido-matches' at the front of the list."
@@ -3081,8 +3081,8 @@
   (if ido-matches
       (let ((prev (car (last ido-matches))))
        (setq ido-cur-list (ido-chop ido-cur-list prev))
-       (setq ido-rescan t)
-       (setq ido-rotate t))))
+       (setq ido-matches (ido-chop ido-matches prev))
+       (setq ido-rescan nil))))
 
 (defun ido-next-match-dir ()
   "Find next directory in match list.