(Fswitch_to_buffer): Fall back on pop-to-buffer.

diff --git a/etc/NEWS b/etc/NEWS
index 822560879156930c13c874ccec1621bf5a82c55a..c96a8ad36869900ffbf9befe1feabf93aecb27bf 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -65,6 +65,10 @@ default toolkit, but you can use --with-x-toolkit=gtk if necessary.
 \f
 * Changes in Emacs 23.1
 
+** Operations like C-x b and C-x C-f which use switch-to-buffer do not fail
+any more when used in a minibuffer or a dedicated window.  Instead, they
+fallback on using pop-to-buffer which will use some other window.
+
 ** Emacs now supports using both X displays and ttys in one session.
 Start the server (M-x server-start).  Then `emacsclient -t' creates a
 tty frame connected to the running emacs server.  You can also use any

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a5e9ef48fdbff20ff0877bd4c9a251f96fe59f1..72724275fbf0c77914c173d61534fe34c90fd3db 100644 (file)
--- 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\e$(Q)Z\e(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 366f02a6378ebb0deb44d640cc60031471d2a0cb..1ccb2f70e7d168e1f911762bb6c88a759fc3dac7 100644 (file)
--- 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);
 }