Re: PATCH: Fix IDO interaction with uniquify.el

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

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

> As attached with some simplification. Let me know if the ido part works. Thanks.
>
> Leo

The simplification was uncalled for and it didn't work. I had to use a
remote machine to generate the patches against trunk and must have
some mixups during testing.

Anyway, here are the correct second patch as proposed. Please try it
instead sorry for the inconvenience.

Leo

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

From 808d3d2448e61449846b0b9426cf1706741f7eae Mon Sep 17 00:00:00 2001
From: Leo <sdl.web@gmail.com>
Date: Wed, 5 May 2010 18:03:47 +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      |   12 +++++++-----
 lisp/iswitchb.el |    6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lisp/ido.el b/lisp/ido.el
index d921dfa..bbf7985 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3922,13 +3922,15 @@ 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 `kill-buffer' succeeds so re-make 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..2509e9f 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1042,8 +1042,10 @@ 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 `kill-buffer' succeeds so re-make 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.6.0.2