From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 21 Oct 2024 17:42:01 +0000 (+0300)
Subject: Avoid crashes when scrolling images under winner-mode
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~334
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=48024096fea5ccdeb79dab5793a6f7a293b95919;p=emacs.git

Avoid crashes when scrolling images under winner-mode

* src/window.c (window_scroll_pixel_based): Fix calculation of a
window's vscroll.  (Bug#73933)
---

diff --git a/src/window.c b/src/window.c
index dba2d6a3523..a2b40cb197f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6017,7 +6017,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, bool noerror)
 	      /* The last line was only partially visible, make it fully
 		 visible.  */
 	      w->vscroll = (it.last_visible_y
-			    - it.current_y + it.max_ascent + it.max_descent);
+			    - (it.current_y + it.max_ascent + it.max_descent));
 	      adjust_frame_glyphs (it.f);
 	    }
 	  else