[Emacs-diffs] scratch/gnus-cloud e6381fa 13/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit e6381fa9a1ecaf4af9b1777e0c22374b671fab58
Merge: 0c9487a d2533d7
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/cus-edit.el |    8 --------
 lisp/mouse.el    |    5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 60d07f9..ef12745 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -197,10 +197,6 @@
   :link '(custom-manual "(emacs)Emulation")
   :group 'editing)
 
-(defgroup mouse nil
-  "Mouse support."
-  :group 'editing)
-
 (defgroup outlines nil
   "Support for hierarchical outlining."
   :group 'wp)
@@ -406,10 +402,6 @@
   "Input from the keyboard."
   :group 'environment)
 
-(defgroup mouse nil
-  "Input from the mouse."
-  :group 'environment)
-
 (defgroup menu nil
   "Input from the menus."
   :group 'environment)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index f595326..75b13c4 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -34,6 +34,11 @@
 ;; Indent track-mouse like progn.
 (put 'track-mouse 'lisp-indent-function 0)
 
+(defgroup mouse nil
+  "Input from the mouse."  ;; "Mouse support."
+  :group 'environment
+  :group 'editing)
+
 (defcustom mouse-yank-at-point nil
   "If non-nil, mouse yank commands yank at point instead of at click."
   :type 'boolean