2 files changed, 10 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ca0a5205f8..2d66f8e01f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (read-buffer-to-switch):
+        Avoid making assumptions about `other-buffer'.
+
 2008-04-29  Sam Steingold  <sds@gnu.org>
 
         * vc.el (vc-dir-mode-hook): Add normal hook.
diff --git a/lisp/files.el b/lisp/files.el
index 68c0657df7f..38eb95fe9bd 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1042,13 +1042,12 @@ use with M-x."
 (defun read-buffer-to-switch (prompt)
   "Read the name of a buffer to switch to and return as a string.
 It is intended for `switch-to-buffer' family of commands since they
-need to omit the name of current buffer from the list of complations
+need to omit the name of current buffer from the list of completions
 and default values."
-  (minibuffer-with-setup-hook
-      (lambda ()
-        (set (make-local-variable 'minibuffer-completion-table)
-             (internal-complete-buffer-except (other-buffer (current-buffer) t))))
-    (read-buffer prompt (other-buffer (current-buffer)))))
+  (let ((rbts-completion-table (internal-complete-buffer-except)))
+    (minibuffer-with-setup-hook
+        (lambda () (setq minibuffer-completion-table rbts-completion-table))
+      (read-buffer prompt (other-buffer (current-buffer))))))
 
 (defun switch-to-buffer-other-window (buffer &optional norecord)
   "Select buffer BUFFER in another window.