[Emacs-diffs] Changes to emacs/lisp/ido.el,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/12/27 02:22:36

Index: ido.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ido.el,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- ido.el      27 Dec 2006 00:26:54 -0000      1.120
+++ ido.el      27 Dec 2006 02:22:36 -0000      1.121
@@ -1046,6 +1046,9 @@
 ;; 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 @@
                      (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))