[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#35389: 27.0.50; [PATCH] Emacs on macOS sets mouse-wheel variables di
From: |
Robert Pluim |
Subject: |
bug#35389: 27.0.50; [PATCH] Emacs on macOS sets mouse-wheel variables directly |
Date: |
Tue, 23 Apr 2019 11:47:43 +0200 |
I use the cus-edit+ package, which prompts you to save unsaved
customizations when you exit emacs. This triggers for me all the time,
because lisp/term/ns-win.el does 'setq' on mouse-wheel-scroll-amount
and mouse-wheel-progressive-speed, which I think is a no-no. The patch
below fixes it for me, but Iʼm utterly ignorant of customize, so
perhaps itʼs not the correct fix.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 6a668b213d..7899cbec3e 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -737,23 +737,15 @@ ns-version-string
(defvar mouse-wheel-scroll-amount)
(defvar mouse-wheel-progressive-speed)
-;; FIXME: This doesn't look right. Is there a better way to do this
-;; that keeps customize happy?
(when (featurep 'cocoa)
(let ((appkit-version
(progn (string-match "^appkit-\\([^\s-]*\\)" ns-version-string)
(string-to-number (match-string 1 ns-version-string)))))
;; Appkit 1138 ~= macOS 10.7.
(when (>= appkit-version 1138)
- (setq mouse-wheel-scroll-amount '(1 ((shift) . 5) ((control))))
- (put 'mouse-wheel-scroll-amount 'customized-value
- (list (custom-quote (symbol-value 'mouse-wheel-scroll-amount))))
-
- (setq mouse-wheel-progressive-speed nil)
- (put 'mouse-wheel-progressive-speed 'customized-value
- (list (custom-quote
- (symbol-value 'mouse-wheel-progressive-speed)))))))
-
+ (custom-set-variables
+ (list 'mouse-wheel-scroll-amount ''(1 ((shift) . 5) ((control))) t)
+ (list 'mouse-wheel-progressive-speed nil t)))))
;;;; Color support.
In GNU Emacs 27.0.50 (build 6, x86_64-apple-darwin18.2.0, NS appkit-1671.20
Version 10.14.3 (Build 18D109))
of 2019-04-19 built on rpluim-mac
Repository revision: e8124bfaaf8ba4a07beb4151fa7c5789a7de549c
Repository branch: master
Windowing system distributor 'Apple', version 10.3.1671
System Description: Mac OS X 10.14.3
- bug#35389: 27.0.50; [PATCH] Emacs on macOS sets mouse-wheel variables directly,
Robert Pluim <=