bug#6852: 24.0.50; Wrong behaviour with `ido-enter-matching-directory' set to 'first

[Leo Liu]

On 2013-07-12 16:00 +0800, Julien Danjou wrote:
> The problem isn't that it picks vimperator, the problem is that the
> prompt shows Org/ as the first candidate in the list and that when
> pressing / I expect it to respect what it showed me. :(

I committed a fix. Will you be able to test it from emacs-trunk?

Thanks,
Leo


>From ba377187a3a81358a349e806d24cc7cdf44f4b6b Mon Sep 17 00:00:00 2001
Date: Sat, 13 Jul 2013 08:57:47 +0800
Subject: [PATCH] * ido.el (ido-exhibit): Handle ido-enter-matching-directory
 before ido-set-matches call.

---
 lisp/ido.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/ido.el b/lisp/ido.el
index 9c4e5654..ce43e866 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -4482,11 +4482,6 @@ (defun ido-exhibit ()
          (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 @@ (defun ido-exhibit ()
          (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)
-- 
1.8.3