[Emacs-diffs] trunk r113406: * ido.el (ido-exhibit): Handle ido-enter-matching-directory before

[Leo Liu]

------------------------------------------------------------
revno: 113406
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/6852
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sat 2013-07-13 08:57:47 +0800
message:
  * ido.el (ido-exhibit): Handle ido-enter-matching-directory before
  ido-set-matches call.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/ido.el                    ido.el-20091113204419-o5vbwnq5f7feedwu-2430

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-12 23:55:01 +0000
+++ b/lisp/ChangeLog    2013-07-13 00:57:47 +0000
@@ -1,3 +1,8 @@
+2013-07-13  Leo Liu  <address@hidden>
+
+       * ido.el (ido-exhibit): Handle ido-enter-matching-directory before
+       ido-set-matches call.  (Bug#6852)
+
 2013-07-12  Dmitry Gutov  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-percent-literals-beg-re):

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2013-07-12 01:01:53 +0000
+++ b/lisp/ido.el       2013-07-13 00:57:47 +0000
@@ -4482,11 +4482,6 @@
          (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 @@
          (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)