* ido.el (ido-exhibit): Handle ido-enter-matching-directory before

ido-set-matches call.

Fixes: debbugs:6852

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81bcb1d033c53c20fb8712b006d14978698fc403..a6a0850b346fb974c5e1b8cb6087417a28c3779c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-13  Leo Liu  <sdl.web@gmail.com>
+
+       * ido.el (ido-exhibit): Handle ido-enter-matching-directory before
+       ido-set-matches call.  (Bug#6852)
+
 2013-07-12  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-percent-literals-beg-re):

diff --git a/lisp/ido.el b/lisp/ido.el
index 9c4e56544cba7b1a5e84e122f050a473337ffd20..ce43e866d09f952a02a568ca2948c1b09e5ddf7c 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -4482,11 +4482,6 @@ For details of keybindings, see `ido-find-file'."
          (setq ido-exit 'refresh)
          (exit-minibuffer))
 
-       ;; Update the list of matches
-       (setq ido-text contents)
-       (ido-set-matches)
-       (ido-trace "new    " ido-matches)
-
        (when (and ido-enter-matching-directory
                   ido-matches
                   (or (eq ido-enter-matching-directory 'first)
@@ -4500,6 +4495,11 @@ For details of keybindings, see `ido-find-file'."
          (setq ido-exit 'refresh)
          (exit-minibuffer))
 
+       ;; Update the list of matches
+       (setq ido-text contents)
+       (ido-set-matches)
+       (ido-trace "new    " ido-matches)
+
        (when (and (boundp 'ido-enable-virtual-buffers)
                   (not (eq ido-enable-virtual-buffers 'always))
                   (eq ido-cur-item 'buffer)