From: Kim F. Storm <storm@cua.dk>
Date: Wed, 27 Dec 2006 02:22:36 +0000 (+0000)
Subject: (ido-set-matches-1): Fix last change.  If default item is
X-Git-Tag: emacs-pretest-22.0.93~393
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3d37467b440826accd996b98018cc2bda2405529;p=emacs.git

(ido-set-matches-1): Fix last change.  If default item is
current buffer, it is ok to be first.
---

diff --git a/lisp/ido.el b/lisp/ido.el
index b398e68319d..e02028e526c 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1046,6 +1046,9 @@ so that it doesn't interfere with other minibuffer usage.")
 ;; Stores the current ido item type ('file, 'dir, 'buffer, or 'list).
 (defvar ido-cur-item)
 
+;;; Stores the current default item
+(defvar ido-default-item)
+
 ;; Stores the current list of items that will be searched through.
 ;; The list is ordered, so that the most interesting item comes first,
 ;; although by default, the files visible in the current frame are put
@@ -3580,6 +3583,8 @@ for first matching file."
 		      (string-match re name))
 		 (cond
 		  ((and (eq ido-cur-item 'buffer)
+			(or (not (stringp ido-default-item))
+			    (not (string= name ido-default-item)))
 			(string= name (buffer-name ido-entry-buffer)))
 		   (setq matches (cons item matches)))
 		  ((and full-re (string-match full-re name))