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

ido-set-matches call.

Fixes: debbugs:6852

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81bcb1d033c..a6a0850b346 100644
--- 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 9c4e56544cb..ce43e866d09 100644
--- 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)