diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-09-28 09:02:31 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-09-28 09:02:31 -0700 |
| commit | e61d39cddfd015032a6419ce75c36ecdf1e9fe9f (patch) | |
| tree | f1f941a206a079e9a7b2813dc2f7479c2ba05495 /lisp/ido.el | |
| parent | 3df749b0f8a97c8b8f18a34bce494fd9d4fe987f (diff) | |
| parent | 147c0425024ce9c1dbb7301300867d8563a6730a (diff) | |
| download | emacs-e61d39cddfd015032a6419ce75c36ecdf1e9fe9f.tar.gz | |
Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org
Diffstat (limited to 'lisp/ido.el')
| -rw-r--r-- | lisp/ido.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index d48e7ba858b..f511dbbf8ac 100644 --- 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 "/\\'"))) |