Re: PATCH: Fix IDO interaction with uniquify.el

[Leo <sdl.web@googlemail.com>]

[-- Attachment #1: Type: text/plain, Size: 876 bytes --]

On 5 May 2010 10:56, Juanma Barranquero <lekktu@gmail.com> wrote:
> [......]

I take the point. I have included a patch that fix the bug in a more
general but still cleaner way. Please let me know if it works for you
in both ido and iswitchb too. Thanks.

> IMHO the virtual buffers feature is still a bit unfinished. For
> example, it doesn't support multiple "virtual buffers" for files with
> the same name on different directories. There was talk of using
> uniquify to fix that, but again, my feeling is that tying ido to
> uniquify is unwise; the virtual buffers implementation (on ido) should
> fix its own problems in a more generic way.

This is put on hold until FSF received my paper. As soon as that
happens John will push patches from his repo, one of which will also
enable C-k to kill virtual buffers.

> Just my 0,02€
>
>    Juanma

Leo

[-- Attachment #2: 0001-Fix-a-bug-in-both-ido-and-switchb-related-to-killing.patch --]
[-- Type: application/octet-stream, Size: 1932 bytes --]

From 908978b51bb0a5edf0af01b42222887ac2ce12a6 Mon Sep 17 00:00:00 2001
From: Leo <sdl.web@gmail.com>
Date: Wed, 5 May 2010 13:33:13 +0100
Subject: [PATCH] Fix a bug in both ido and switchb related to killing buffers

by rebuilding buffer list since packages like uniquify may rename
buffers.
---
 lisp/ido.el      |   11 ++++++-----
 lisp/iswitchb.el |    5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lisp/ido.el b/lisp/ido.el
index 7cdeb70..298eca7 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3965,13 +3965,14 @@ If cursor is not at the end of the user input, delete to end of input."
     (let ((enable-recursive-minibuffers t)
 	  (buf (ido-name (car ido-matches))))
       (when buf
-	(kill-buffer buf)
-	;; Check if buffer still exists.
-	(if (get-buffer buf)
+	(if (null (kill-buffer buf))
 	    ;; buffer couldn't be killed.
 	    (setq ido-rescan t)
-	  ;; else buffer was killed so remove name from list.
-	  (setq ido-cur-list (delq buf ido-cur-list)))))))
+	  ;; else re-generate the buffer list taking into account
+	  ;; packages like uniquify may rename buffers
+	  (setq ido-text-init ido-text)
+	  (setq ido-exit 'refresh)
+	  (exit-minibuffer))))))
 
 ;;; DELETE CURRENT FILE
 (defun ido-delete-file-at-head ()
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index ea4b00d..4e939c5 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1042,8 +1042,9 @@ Return the modified list with the last element prepended to it."
 	  (if (get-buffer buf)
 	      ;; buffer couldn't be killed.
 	      (setq iswitchb-rescan t)
-	    ;; else buffer was killed so remove name from list.
-	    (setq iswitchb-buflist  (delq buf iswitchb-buflist)))))))
+	    ;; else re-generate the buffer list taking into account
+	    ;; packages like uniquify may rename buffers
+	    (iswitchb-make-buflist iswitchb-default))))))
 
 ;;; VISIT CHOSEN BUFFER
 (defun iswitchb-visit-buffer (buffer)
-- 
1.7.0.4