procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ns-win.el on GNUstep

Browse source 
* lisp/term/ns-win.el: Appkit version check only works on macOS, so
don't try it when not using Cocoa.
This commit is contained in:
Alan Third 2017-08-15 09:58:33 +01:00
parent 07ea5ef99a
commit 7abb5c3960
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lisp/term/ns-win.el
View 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 ;; FIXME: This doesn't look right. Is there a better way to do this
;; that keeps customize happy? ;; that keeps customize happy?
(let ((appkit-version (progn (when (featurep 'cocoa)
(string-match "^appkit-\\([^\s-]*\\)" ns-version-string) (let ((appkit-version
(string-to-number (match-string 1 ns-version-string))))) (progn (string-match "^appkit-\\([^\s-]*\\)" ns-version-string)
;; Appkit 1138 ~= macOS 10.7. (string-to-number (match-string 1 ns-version-string)))))
(when (and (featurep 'cocoa) (>= appkit-version 1138)) ;; Appkit 1138 ~= macOS 10.7.
(setq mouse-wheel-scroll-amount '(1 ((shift) . 5) ((control)))) (when (>= appkit-version 1138)
(put 'mouse-wheel-scroll-amount 'customized-value (setq mouse-wheel-scroll-amount '(1 ((shift) . 5) ((control))))
(list (custom-quote (symbol-value 'mouse-wheel-scroll-amount)))) (put 'mouse-wheel-scroll-amount 'customized-value
(list (custom-quote (symbol-value 'mouse-wheel-scroll-amount))))
(setq mouse-wheel-progressive-speed nil) (setq mouse-wheel-progressive-speed nil)
(put 'mouse-wheel-progressive-speed 'customized-value (put 'mouse-wheel-progressive-speed 'customized-value
(list (custom-quote (symbol-value 'mouse-wheel-progressive-speed)))))) (list (custom-quote
(symbol-value 'mouse-wheel-progressive-speed)))))))
;;;; Color support. ;;;; Color support.