From 97ead0e597427786571cd69e052a2886d1da6032 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sat, 13 Jul 2013 08:57:47 +0800 Subject: * ido.el (ido-exhibit): Handle ido-enter-matching-directory before ido-set-matches call. Fixes: debbugs:6852 --- lisp/ido.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lisp/ido.el') diff --git a/lisp/ido.el b/lisp/ido.el index 9c4e56544c..ce43e866d0 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) -- cgit v1.2.3