diff options
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 30 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 2 |
2 files changed, 17 insertions, 15 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index bc211ea9589..b8d1a436909 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -594,7 +594,7 @@ the last file dropped is selected." (declare-function tool-bar-mode "tool-bar" (&optional arg)) ;; Based on a function by David Reitter <dreitter@inf.ed.ac.uk> ; -;; see http://lists.gnu.org/archive/html/emacs-devel/2005-09/msg00681.html . +;; see https://lists.gnu.org/archive/html/emacs-devel/2005-09/msg00681.html . (defun ns-toggle-toolbar (&optional frame) "Switches the tool bar on and off in frame FRAME. If FRAME is nil, the change applies to the selected frame." @@ -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. @@ -876,7 +878,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") ;; Mac OS X Lion introduces PressAndHold, which is unsupported by this port. ;; See this thread for more details: - ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html + ;; https://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html (ns-set-resource nil "ApplePressAndHoldEnabled" "NO") (x-apply-session-resources) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index b769444671c..62200bf2cbd 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1287,7 +1287,7 @@ This returns an error if any Emacs frames are X frames." ;; During initialization, we defer sending size hints to the window ;; manager, because that can induce a race condition: - ;; http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html + ;; https://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html ;; Send the size hints once initialization is done. (add-hook 'after-init-hook 'x-wm-set-size-hint) |