diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/obsolete/mouse-sel.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/obsolete/mouse-sel.el')
-rw-r--r-- | lisp/obsolete/mouse-sel.el | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lisp/obsolete/mouse-sel.el b/lisp/obsolete/mouse-sel.el index 608596e882b..36d9dc658c7 100644 --- a/lisp/obsolete/mouse-sel.el +++ b/lisp/obsolete/mouse-sel.el @@ -1,4 +1,4 @@ -;;; mouse-sel.el --- multi-click selection support +;;; mouse-sel.el --- multi-click selection support -*- lexical-binding: t; -*- ;; Copyright (C) 1993-1995, 2001-2021 Free Software Foundation, Inc. @@ -146,20 +146,17 @@ If non-nil, \\[mouse-select] and \\[mouse-extend] will leave point at the end of the region nearest to where the mouse last was. If nil, point will always be placed at the beginning of the region." - :type 'boolean - :group 'mouse-sel) + :type 'boolean) (defcustom mouse-sel-cycle-clicks t "If non-nil, \\[mouse-select] cycles the click-counts after 4 clicks." - :type 'boolean - :group 'mouse-sel) + :type 'boolean) (defcustom mouse-sel-default-bindings t "Control mouse bindings." :type '(choice (const :tag "none" nil) (const :tag "cut and paste" interprogram-cut-paste) - (other :tag "default bindings" t)) - :group 'mouse-sel) + (other :tag "default bindings" t))) ;;=== Key bindings ======================================================== @@ -216,14 +213,13 @@ the mouse position (or point, if `mouse-yank-at-point' is non-nil). - mouse-2 while selecting or extending copies selection to the kill ring; mouse-1 or mouse-3 kills it." :global t - :group 'mouse-sel (if mouse-sel-mode (progn ;; If mouse-2 has never been done by the user, initialize the ;; `event-kind' property to ensure that `follow-link' clicks ;; are interpreted correctly. (put 'mouse-2 'event-kind 'mouse-click) - (add-hook 'x-lost-selection-functions 'mouse-sel-lost-selection-hook) + (add-hook 'x-lost-selection-functions #'mouse-sel-lost-selection-hook) (when mouse-sel-default-bindings ;; Save original bindings and replace them with new ones. (setq mouse-sel-original-bindings @@ -240,7 +236,7 @@ kill ring; mouse-1 or mouse-3 kills it." #'mouse-sel--ignore)))) ;; Restore original bindings - (remove-hook 'x-lost-selection-functions 'mouse-sel-lost-selection-hook) + (remove-hook 'x-lost-selection-functions #'mouse-sel-lost-selection-hook) (dolist (binding mouse-sel-original-bindings) (global-set-key (car binding) (cdr binding))) ;; Restore the old values of these variables, |