1 files changed, 8 insertions, 3 deletions

diff --git a/src/window.c b/src/window.c
index 8d1aed46dff..d3c72570dd1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5652,12 +5652,17 @@ scroll_command (Lisp_Object window, Lisp_Object n, int direction)
   w = XWINDOW (window);
   other_window = ! EQ (window, selected_window);
 
-  /* If given window's buffer isn't current, make it current for
-     the moment.  But don't screw up if window_scroll gets an error.  */
+  /* If given window's buffer isn't current, make it current for the
+     moment.  If the window's buffer is the same, but it is not the
+     selected window, we need to save-excursion to avoid affecting
+     point in the selected window (which would cause the selected
+     window to scroll).  Don't screw up if window_scroll gets an
+     error.  */
   if (other_window || XBUFFER (w->contents) != current_buffer)
     {
       record_unwind_protect_excursion ();
-      Fset_buffer (w->contents);
+      if (XBUFFER (w->contents) != current_buffer)
+        Fset_buffer (w->contents);
     }
 
   if (other_window)