ido.el (ido-set-matches-1): Fix 2012-09-11 change

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0fae89f1e01679a2935077f660fb53947204af07..4878f5eb4673785f5ca97984d92d9f53bbdc34c7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-28  Leo Liu  <sdl.web@gmail.com>
+
+       * ido.el (ido-set-matches-1): Fix 2012-09-11 change.
+
 2012-09-16  Leo Liu  <sdl.web@gmail.com>
 
        IDO: Disable match re-ordering for buffer switching.

diff --git a/lisp/ido.el b/lisp/ido.el
index a2712db804d0d5fafaf6eb20206248477e95db4b..53533142e30ebee3435bc704210340c4ccdcee97 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3701,14 +3701,14 @@ This is to make them appear as if they were \"virtual buffers\"."
         (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 "/\\'")))