[Emacs-diffs] /srv/bzr/emacs/trunk r103887: Enable ido to kill virtual buffers

[Leo Liu]

------------------------------------------------------------
revno: 103887
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2011-04-11 11:44:54 +0800
message:
  Enable ido to kill virtual buffers
modified:
  lisp/ChangeLog
  lisp/ido.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-10 21:31:14 +0000
+++ b/lisp/ChangeLog    2011-04-11 03:44:54 +0000
@@ -1,3 +1,9 @@
+2011-04-11  Leo Liu  <address@hidden>
+
+       * ido.el (ido-buffer-internal): Allow method 'kill for virtual
+       buffers.
+       (ido-kill-buffer-at-head): Support killing virtual buffers.
+
 2011-04-10  Chong Yidong  <address@hidden>
 
        * minibuffer.el (completion-show-inline-help): New var.

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2011-03-29 08:25:31 +0000
+++ b/lisp/ido.el       2011-04-11 03:44:54 +0000
@@ -2176,9 +2176,7 @@
           (ido-current-directory nil)
           (ido-directory-nonreadable nil)
           (ido-directory-too-big nil)
-          (ido-use-virtual-buffers (if (eq method 'kill)
-                                       nil    ;; Don't consider virtual 
buffers for killing
-                                     ido-use-virtual-buffers))
+          (ido-use-virtual-buffers 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))
@@ -3917,10 +3915,10 @@
     (let ((enable-recursive-minibuffers t)
          (buf (ido-name (car ido-matches)))
          (nextbuf (cadr ido-matches)))
-      (when (get-buffer buf)
+      (cond
+       ((get-buffer buf)
        ;; If next match names a buffer use the buffer object; buffer
-       ;; name may be changed by packages such as uniquify; mindful
-       ;; of virtual buffers.
+       ;; name may be changed by packages such as uniquify.
        (when (and nextbuf (get-buffer nextbuf))
          (setq nextbuf (get-buffer nextbuf)))
        (if (null (kill-buffer buf))
@@ -3934,7 +3932,13 @@
          (setq ido-default-item nextbuf
                ido-text-init ido-text
                ido-exit 'refresh)
-         (exit-minibuffer))))))
+         (exit-minibuffer)))
+       ;; Handle virtual buffers
+       ((assoc buf ido-virtual-buffers)
+       (setq recentf-list
+             (delete (cdr (assoc buf ido-virtual-buffers)) recentf-list))
+       (setq ido-cur-list (delete buf ido-cur-list))
+       (setq ido-rescan t))))))
 
 ;;; DELETE CURRENT FILE
 (defun ido-delete-file-at-head ()