From: Leo Liu <sdl.web@gmail.com>
Date: Sat, 13 Jul 2013 00:57:47 +0000 (+0800)
Subject: * ido.el (ido-exhibit): Handle ido-enter-matching-directory before
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1807
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97ead0e597427786571cd69e052a2886d1da6032;p=emacs.git

* 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 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)