aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2016-07-13 11:08:21 -0400
committerStefan Monnier2016-07-13 11:08:21 -0400
commitd2533d72680f2c14730cf8699bb2cdd18eba4365 (patch)
tree5697459b006ae19bd7b53384e0c73b7d4e9d0263
parent96bd07a3226700156fa7d5ec20e9bd6550c95057 (diff)
downloademacs-d2533d72680f2c14730cf8699bb2cdd18eba4365.tar.gz
emacs-d2533d72680f2c14730cf8699bb2cdd18eba4365.zip
* lisp/mouse.el (mouse): Consolidate group definition here
* lisp/cus-edit.el (mouse): Remove both group definitions.
-rw-r--r--lisp/cus-edit.el8
-rw-r--r--lisp/mouse.el5
2 files changed, 5 insertions, 8 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 60d07f9bc77..ef1274534d6 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -197,10 +197,6 @@
197 :link '(custom-manual "(emacs)Emulation") 197 :link '(custom-manual "(emacs)Emulation")
198 :group 'editing) 198 :group 'editing)
199 199
200(defgroup mouse nil
201 "Mouse support."
202 :group 'editing)
203
204(defgroup outlines nil 200(defgroup outlines nil
205 "Support for hierarchical outlining." 201 "Support for hierarchical outlining."
206 :group 'wp) 202 :group 'wp)
@@ -406,10 +402,6 @@
406 "Input from the keyboard." 402 "Input from the keyboard."
407 :group 'environment) 403 :group 'environment)
408 404
409(defgroup mouse nil
410 "Input from the mouse."
411 :group 'environment)
412
413(defgroup menu nil 405(defgroup menu nil
414 "Input from the menus." 406 "Input from the menus."
415 :group 'environment) 407 :group 'environment)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index f5953265ff0..75b13c4409c 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -34,6 +34,11 @@
34;; Indent track-mouse like progn. 34;; Indent track-mouse like progn.
35(put 'track-mouse 'lisp-indent-function 0) 35(put 'track-mouse 'lisp-indent-function 0)
36 36
37(defgroup mouse nil
38 "Input from the mouse." ;; "Mouse support."
39 :group 'environment
40 :group 'editing)
41
37(defcustom mouse-yank-at-point nil 42(defcustom mouse-yank-at-point nil
38 "If non-nil, mouse yank commands yank at point instead of at click." 43 "If non-nil, mouse yank commands yank at point instead of at click."
39 :type 'boolean 44 :type 'boolean