When killing buffers with ido, don't offer virtual buffers for completion.

* ido.el (ido-buffer-internal): Bind `ido-use-virtual-buffers' to nil
  when method is 'kill.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6aa1a55fb53e95feec90dba01e5bb390ac1c9134..2cdf49aa00e81a40f3ba4ad44701f0488730d596 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2010-04-27  Agustín Martín <agustin.martin@hispalinux.es>
+2010-04-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * ido.el (ido-buffer-internal): Bind `ido-use-virtual-buffers' to nil
+       when method is 'kill.
+
+2010-04-27  Agustín Martín  <agustin.martin@hispalinux.es>
 
        * ispell.el (ispell-init-process): Fix personal dictionary condition
        in default directory check.

diff --git a/lisp/ido.el b/lisp/ido.el
index 14a5c14ff09539e131bbed05c17c502baf39b7a5..101ef0438ea0654f27fc2e223f270f44bc171c08 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2183,7 +2183,9 @@ If cursor is not at the end of the user input, move to end of input."
           (ido-current-directory nil)
           (ido-directory-nonreadable nil)
           (ido-directory-too-big nil)
-          (ido-use-virtual-buffers ido-use-virtual-buffers)
+          (ido-use-virtual-buffers (if (eq method 'kill)
+                                       nil    ;; Don't consider virtual buffers for killing
+                                     ido-use-virtual-buffers))
           (require-match (confirm-nonexistent-file-or-buffer))
           (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default
                                   require-match initial))