diff options
| author | Po Lu <luangruo@yahoo.com> | 2021-11-30 08:16:50 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2021-11-30 08:16:50 +0800 |
| commit | 8f5d2a3181d22f858ede3fb6a1452f99272901fe (patch) | |
| tree | 1921a09e17c7c29d2637b073cf7b2158c71c6017 /lisp/cus-start.el | |
| parent | 901938109f7b5574e97e787bee10441086680de8 (diff) | |
| parent | d8dd705e9d82df96d67d88e1bf90373b6b4fbaa9 (diff) | |
| download | emacs-8f5d2a3181d22f858ede3fb6a1452f99272901fe.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index a46107a6784..33b861b3408 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -826,10 +826,15 @@ since it could result in memory overflow and make Emacs crash." (x-underline-at-descent-line display boolean "22.1") (x-stretch-cursor display boolean "21.1") (scroll-bar-adjust-thumb-portion windows boolean "24.4") + (x-scroll-event-delta-factor mouse float "29.1") ;; xselect.c (x-select-enable-clipboard-manager killing boolean "24.1") ;; xsettings.c - (font-use-system-font font-selection boolean "23.2"))) + (font-use-system-font font-selection boolean "23.2") + ;; haikuterm.c + (haiku-debug-on-fatal-error debug boolean "29.1") + ;; haikufns.c + (haiku-use-system-tooltips tooltip boolean "29.1"))) (setq ;; If we did not specify any standard value expression above, ;; use the current value as the standard value. standard (if (setq prop (memq :standard rest)) @@ -846,10 +851,17 @@ since it could result in memory overflow and make Emacs crash." (eq system-type 'windows-nt)) ((string-match "\\`ns-" (symbol-name symbol)) (featurep 'ns)) + ((string-match "\\`haiku-" (symbol-name symbol)) + (featurep 'haiku)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) (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)) @@ -870,9 +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)) - ((equal "scroll-bar-adjust-thumb-portion" - (symbol-name symbol)) - (featurep 'x)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here! |