aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-04-27 13:47:19 +0200
committerJuanma Barranquero2010-04-27 13:47:19 +0200
commitcecaa6745f10332a30f4ba42c0e41278072b92e3 (patch)
treecebfc6cdec7ef4704c13f38435b338baf87f8b21
parent1e116bb3a9bae9308db9e184ea577506e69b6c1b (diff)
downloademacs-cecaa6745f10332a30f4ba42c0e41278072b92e3.tar.gz
emacs-cecaa6745f10332a30f4ba42c0e41278072b92e3.zip
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.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/ido.el4
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6aa1a55fb53..2cdf49aa00e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
12010-04-27 Agustín Martín <agustin.martin@hispalinux.es> 12010-04-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * ido.el (ido-buffer-internal): Bind `ido-use-virtual-buffers' to nil
4 when method is 'kill.
5
62010-04-27 Agustín Martín <agustin.martin@hispalinux.es>
2 7
3 * ispell.el (ispell-init-process): Fix personal dictionary condition 8 * ispell.el (ispell-init-process): Fix personal dictionary condition
4 in default directory check. 9 in default directory check.
diff --git a/lisp/ido.el b/lisp/ido.el
index 14a5c14ff09..101ef0438ea 100644
--- 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."
2183 (ido-current-directory nil) 2183 (ido-current-directory nil)
2184 (ido-directory-nonreadable nil) 2184 (ido-directory-nonreadable nil)
2185 (ido-directory-too-big nil) 2185 (ido-directory-too-big nil)
2186 (ido-use-virtual-buffers ido-use-virtual-buffers) 2186 (ido-use-virtual-buffers (if (eq method 'kill)
2187 nil ;; Don't consider virtual buffers for killing
2188 ido-use-virtual-buffers))
2187 (require-match (confirm-nonexistent-file-or-buffer)) 2189 (require-match (confirm-nonexistent-file-or-buffer))
2188 (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default 2190 (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default
2189 require-match initial)) 2191 require-match initial))