(Fswitch_to_buffer): Revert part of 2008-10-21's change.

2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a2c45aa9d6..4ed76e3b238 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buffer.c (Fswitch_to_buffer): Revert part of 2008-10-21's change.
+
 2009-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * lread.c (Feval_buffer): Doc fix.
diff --git a/src/buffer.c b/src/buffer.c
index ee983aed6d4..f3b4fea4455 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1800,9 +1800,11 @@ messing with the window-buffer correspondences.  */)
         record_buffer (buffer_or_name);
       return Fset_buffer (buffer_or_name);
     }
-
-  if (EQ (minibuf_window, selected_window)
-      || !NILP (Fwindow_dedicated_p (selected_window)))
+  else if (EQ (minibuf_window, selected_window)
+           /* If `dedicated' is neither nil nor t, it means it's
+              dedicatedness can be overridden by an explicit request
+              such as a call to switch-to-buffer.  */
+           || EQ (Fwindow_dedicated_p (selected_window), Qt))
     /* We can't use the selected window so let `pop-to-buffer' try some
        other window. */
     return call3 (intern ("pop-to-buffer"), buffer_or_name, Qnil, norecord);