From: Po Lu <luangruo@yahoo.com>
Date: Mon, 29 Nov 2021 10:25:10 +0000 (+0800)
Subject: Really make `x-scroll-event-delta-factor' dependent on system
X-Git-Tag: emacs-29.0.90~3649^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8dd705e9d82df96d67d88e1bf90373b6b4fbaa9;p=emacs.git

Really make `x-scroll-event-delta-factor' dependent on system

* lisp/cus-start.el: Move X specific builtins that start
with "x-" before the catch-all test.
---

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 45b81e5bc5f..33b861b3408 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -857,6 +857,11 @@ since it could result in memory overflow and make Emacs crash."
 		       (featurep 'gtk))
 		      ((string-match "clipboard-manager" (symbol-name symbol))
 		       (boundp 'x-select-enable-clipboard-manager))
+                      ((or (equal "scroll-bar-adjust-thumb-portion"
+			          (symbol-name symbol))
+                           (equal "x-scroll-event-delta-factor"
+                                  (symbol-name symbol)))
+		       (featurep 'x))
 		      ((string-match "\\`x-" (symbol-name symbol))
 		       (fboundp 'x-create-frame))
 		      ((string-match "selection" (symbol-name symbol))
@@ -877,11 +882,6 @@ since it could result in memory overflow and make Emacs crash."
 			      (symbol-name symbol))
 		       ;; Any function from fontset.c will do.
 		       (fboundp 'new-fontset))
-		      ((or (equal "scroll-bar-adjust-thumb-portion"
-			          (symbol-name symbol))
-                           (equal "x-scroll-event-delta-factor"
-                                  (symbol-name symbol)))
-		       (featurep 'x))
 		      (t t))))
     (if (not (boundp symbol))
 	;; If variables are removed from C code, give an error here!