From: Basil L. Contovounesios <contovob@tcd.ie>
Date: Fri, 6 Jul 2018 23:23:21 +0000 (-0700)
Subject: Fix scrolling
X-Git-Tag: emacs-27.0.90~4718
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c60c4e2ff6a8c2d70b67fca868c27ebb125ee4d;p=emacs.git

Fix scrolling

* src/window.c (scroll_command): Fix scrolling.
---

diff --git a/src/window.c b/src/window.c
index 20f6862e3b4..8d1aed46dff 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5654,7 +5654,7 @@ scroll_command (Lisp_Object window, Lisp_Object n, int direction)
 
   /* 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 (XBUFFER (w->contents) != current_buffer)
+  if (other_window || XBUFFER (w->contents) != current_buffer)
     {
       record_unwind_protect_excursion ();
       Fset_buffer (w->contents);