From: Po Lu <luangruo@yahoo.com>
Date: Tue, 30 Nov 2021 01:46:25 +0000 (+0800)
Subject: Allow non-float values in x-scroll-event-delta-factor
X-Git-Tag: emacs-29.0.90~3639^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a59deef359c5ffa49ea2adb78250f4d4adf94447;p=emacs.git

Allow non-float values in x-scroll-event-delta-factor

* src/xterm.c (handle_one_xevent): Use XFLOATINT instead of
XFLOAT_DATA.
---

diff --git a/src/xterm.c b/src/xterm.c
index a6d9c8c7a1b..ed6a31125c9 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10045,8 +10045,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
 			scroll_unit = pow (FRAME_PIXEL_HEIGHT (f), 2.0 / 3.0);
 
-			if (FLOATP (Vx_scroll_event_delta_factor))
-			  scroll_unit *= XFLOAT_DATA (Vx_scroll_event_delta_factor);
+			if (NUMBERP (Vx_scroll_event_delta_factor))
+			  scroll_unit *= XFLOATINT (Vx_scroll_event_delta_factor);
 
 			if (val->horizontal)
 			  {