comparison src/buffer.c @ 102466:13c12974c2f0

(Fswitch_to_buffer): Revert part of 2008-10-21's change.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 10 Mar 2009 03:35:27 +0000
parents e038c1a8307c
children f40356cf5650
comparison
equal deleted inserted replaced
102465:245a1f77b840 102466:13c12974c2f0
1798 move it to the front of the frame's buffer list. */ 1798 move it to the front of the frame's buffer list. */
1799 if (NILP (norecord)) 1799 if (NILP (norecord))
1800 record_buffer (buffer_or_name); 1800 record_buffer (buffer_or_name);
1801 return Fset_buffer (buffer_or_name); 1801 return Fset_buffer (buffer_or_name);
1802 } 1802 }
1803 1803 else if (EQ (minibuf_window, selected_window)
1804 if (EQ (minibuf_window, selected_window) 1804 /* If `dedicated' is neither nil nor t, it means it's
1805 || !NILP (Fwindow_dedicated_p (selected_window))) 1805 dedicatedness can be overridden by an explicit request
1806 such as a call to switch-to-buffer. */
1807 || EQ (Fwindow_dedicated_p (selected_window), Qt))
1806 /* We can't use the selected window so let `pop-to-buffer' try some 1808 /* We can't use the selected window so let `pop-to-buffer' try some
1807 other window. */ 1809 other window. */
1808 return call3 (intern ("pop-to-buffer"), buffer_or_name, Qnil, norecord); 1810 return call3 (intern ("pop-to-buffer"), buffer_or_name, Qnil, norecord);
1809 else 1811 else
1810 return switch_to_buffer_1 (buffer_or_name, norecord); 1812 return switch_to_buffer_1 (buffer_or_name, norecord);