1 files changed, 7 insertions, 3 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 343686d43f1..1b5a66b0986 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1534,9 +1534,6 @@ selected window if it is displayed there.")
   if (NILP (buffer))
     {
       XSETBUFFER (buffer, current_buffer);
-
-      /* If we're burying the current buffer, unshow it.  */
-      Fswitch_to_buffer (Fother_buffer (buffer, Qnil), Qnil);
     }
   else
     {
@@ -1548,6 +1545,13 @@ selected window if it is displayed there.")
       buffer = buf1;
     }
 
+  /* Unshow the buffer in the selected window, if it is there.  */
+  if (EQ (XWINDOW (selected_window)->buffer, buffer))
+    Fswitch_to_buffer (Fother_buffer (buffer, Qnil), Qnil);
+  /* Otherwise, unshow it in other frames.  */
+  else
+    Freplace_buffer_in_windows (buffer);
+
   /* Move buffer to the end of the buffer list.  */
   {
     register Lisp_Object aelt, link;