[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108149: ido.el (ido-set-matches-1): Fix 2012-09-11 change

[Leo Liu]

------------------------------------------------------------
revno: 108149
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-09-28 21:38:26 +0800
message:
  ido.el (ido-set-matches-1): Fix 2012-09-11 change
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-17 00:48:04 +0000
+++ b/lisp/ChangeLog    2012-09-28 13:38:26 +0000
@@ -1,3 +1,7 @@
+2012-09-28  Leo Liu  <address@hidden>
+
+       * ido.el (ido-set-matches-1): Fix 2012-09-11 change.
+
 2012-09-16  Leo Liu  <address@hidden>
 
        IDO: Disable match re-ordering for buffer switching.

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2012-09-17 00:48:04 +0000
+++ b/lisp/ido.el       2012-09-28 13:38:26 +0000
@@ -3701,14 +3701,14 @@
         (rexq (concat rex0 (if slash ".*/" "")))
         (re (if ido-enable-prefix (concat "\\`" rexq) rexq))
         (full-re (and do-full
-                      (and (eq ido-cur-item 'buffer)
-                           (not ido-buffer-disable-smart-matches))
+                      (not (and (eq ido-cur-item 'buffer)
+                                ido-buffer-disable-smart-matches))
                       (not ido-enable-regexp)
                       (not (string-match "\$\\'" rex0))
                       (concat "\\`" rex0 (if slash "/" "") "\\'")))
         (suffix-re (and do-full slash
-                        (and (eq ido-cur-item 'buffer)
-                             (not ido-buffer-disable-smart-matches))
+                        (not (and (eq ido-cur-item 'buffer)
+                                  ido-buffer-disable-smart-matches))
                         (not ido-enable-regexp)
                         (not (string-match "\$\\'" rex0))
                         (concat rex0 "/\\'")))