diff options
| author | Stefan Monnier | 2009-03-10 03:35:27 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-03-10 03:35:27 +0000 |
| commit | 61313fa38c072e148eb02f299fc743e669721912 (patch) | |
| tree | 80b181b0cebcc373d9dd404742f9c02e9b29eced /src/buffer.c | |
| parent | 72097cd9ef448b5ece469afe4a88835aafeff189 (diff) | |
| download | emacs-61313fa38c072e148eb02f299fc743e669721912.tar.gz emacs-61313fa38c072e148eb02f299fc743e669721912.zip | |
(Fswitch_to_buffer): Revert part of 2008-10-21's change.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 8 |
1 files changed, 5 insertions, 3 deletions
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. */) | |||
| 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); |