]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix ns-win.el on GNUstep
authorAlan Third <alan@breton-build.holly.idiocy.org>
Tue, 15 Aug 2017 08:58:33 +0000 (09:58 +0100)
committerAlan Third <alan@breton-build.holly.idiocy.org>
Tue, 15 Aug 2017 08:58:33 +0000 (09:58 +0100)
* 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

index bc211ea95896fc8bab26bb60594741158956881f..16633792e4fc1e7db351392613ba0473b3b12505 100644 (file)
@@ -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.