Commit 61313fa3 authored by Stefan Monnier's avatar Stefan Monnier

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

parent 72097cd9
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.
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment