diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/buffer.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5a5e9ef48fd..72724275fbf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-03-12 Stefan Monnier <monnier@iro.umontreal.ca> + + * buffer.c (Fswitch_to_buffer): Fall back on pop-to-buffer. + 2008-03-11 Jan Dj$(Q)Z(Brv <jan.h.d@swipnet.se> * xterm.c (x_connection_closed): For GTK: If this is the last diff --git a/src/buffer.c b/src/buffer.c index 366f02a6378..1ccb2f70e7d 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1802,7 +1802,10 @@ the window-buffer correspondences. */) } err = no_switch_window (selected_window); - if (err) error (err); + if (err) + /* If can't display in current window, let pop-to-buffer + try some other window. */ + return call3 (intern ("pop-to-buffer"), buffer, Qnil, norecord); return switch_to_buffer_1 (buffer, norecord); } |