[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 7abb5c3: Fix ns-win.el on GNUstep
From: |
Alan Third |
Subject: |
[Emacs-diffs] emacs-26 7abb5c3: Fix ns-win.el on GNUstep |
Date: |
Sun, 1 Oct 2017 06:24:52 -0400 (EDT) |
branch: emacs-26
commit 7abb5c39601a420bf74db41e2d70f8e36d07e349
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>
Fix ns-win.el on GNUstep
* lisp/term/ns-win.el: Appkit version check only works on macOS, so
don't try it when not using Cocoa.
---
lisp/term/ns-win.el | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index bc211ea..1663379 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -741,18 +741,20 @@ See the documentation of
`create-fontset-from-fontset-spec' for the format.")
;; FIXME: This doesn't look right. Is there a better way to do this
;; that keeps customize happy?
-(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 (and (featurep 'cocoa) (>= 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))))))
+(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)))))))
;;;; Color support.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 7abb5c3: Fix ns-win.el on GNUstep,
Alan Third <=