diff options
| author | Alan Third | 2017-08-15 09:58:33 +0100 |
|---|---|---|
| committer | Alan Third | 2017-08-15 09:58:33 +0100 |
| commit | 7abb5c39601a420bf74db41e2d70f8e36d07e349 (patch) | |
| tree | 8385a054e9b6e758cfee62a03a5f42754434ca02 | |
| parent | 07ea5ef99a509622981a8ca69aadff15cbc0ef10 (diff) | |
| download | emacs-7abb5c39601a420bf74db41e2d70f8e36d07e349.tar.gz emacs-7abb5c39601a420bf74db41e2d70f8e36d07e349.zip | |
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.
| -rw-r--r-- | lisp/term/ns-win.el | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index bc211ea9589..16633792e4f 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.") | |||
| 741 | 741 | ||
| 742 | ;; FIXME: This doesn't look right. Is there a better way to do this | 742 | ;; FIXME: This doesn't look right. Is there a better way to do this |
| 743 | ;; that keeps customize happy? | 743 | ;; that keeps customize happy? |
| 744 | (let ((appkit-version (progn | 744 | (when (featurep 'cocoa) |
| 745 | (string-match "^appkit-\\([^\s-]*\\)" ns-version-string) | 745 | (let ((appkit-version |
| 746 | (string-to-number (match-string 1 ns-version-string))))) | 746 | (progn (string-match "^appkit-\\([^\s-]*\\)" ns-version-string) |
| 747 | ;; Appkit 1138 ~= macOS 10.7. | 747 | (string-to-number (match-string 1 ns-version-string))))) |
| 748 | (when (and (featurep 'cocoa) (>= appkit-version 1138)) | 748 | ;; Appkit 1138 ~= macOS 10.7. |
| 749 | (setq mouse-wheel-scroll-amount '(1 ((shift) . 5) ((control)))) | 749 | (when (>= appkit-version 1138) |
| 750 | (put 'mouse-wheel-scroll-amount 'customized-value | 750 | (setq mouse-wheel-scroll-amount '(1 ((shift) . 5) ((control)))) |
| 751 | (list (custom-quote (symbol-value 'mouse-wheel-scroll-amount)))) | 751 | (put 'mouse-wheel-scroll-amount 'customized-value |
| 752 | 752 | (list (custom-quote (symbol-value 'mouse-wheel-scroll-amount)))) | |
| 753 | (setq mouse-wheel-progressive-speed nil) | 753 | |
| 754 | (put 'mouse-wheel-progressive-speed 'customized-value | 754 | (setq mouse-wheel-progressive-speed nil) |
| 755 | (list (custom-quote (symbol-value 'mouse-wheel-progressive-speed)))))) | 755 | (put 'mouse-wheel-progressive-speed 'customized-value |
| 756 | (list (custom-quote | ||
| 757 | (symbol-value 'mouse-wheel-progressive-speed))))))) | ||
| 756 | 758 | ||
| 757 | 759 | ||
| 758 | ;;;; Color support. | 760 | ;;;; Color support. |