Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org

[gnu-emacs] / lisp / ido.el

diff --git a/lisp/ido.el b/lisp/ido.el
index d48e7ba858ba6209192b45fbb5b358ec637bac66..f511dbbf8aceb75b8d51a7288ea43c864c292d76 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 "/\\'")))