master cfe8d9e 2/3: Remove redundant :group args in play/*.el

[Stefan Kangas]

branch: master
commit cfe8d9e0f74a1256cb75bd467b866f03ac513634
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Remove redundant :group args in play/*.el
    
    * lisp/play/bubbles.el:
    * lisp/play/cookie1.el:
    * lisp/play/decipher.el:
    * lisp/play/dunnet.el:
    * lisp/play/gametree.el:
    * lisp/play/gomoku.el:
    * lisp/play/hanoi.el: Remove redundant :group args.
---
 lisp/play/bubbles.el  | 11 +++++------
 lisp/play/cookie1.el  |  1 -
 lisp/play/decipher.el | 12 ++++--------
 lisp/play/dunnet.el   |  3 +--
 lisp/play/gametree.el | 30 ++++++++++--------------------
 lisp/play/gomoku.el   |  9 +++------
 lisp/play/hanoi.el    | 14 +++++++-------
 7 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index f317ad5..dc93ef9 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -82,6 +82,10 @@
 ;; Careful with that axe, Eugene! Order does matter in the custom
 ;; section below.
 
+(defgroup bubbles nil
+  "Bubbles, a puzzle game."
+  :group 'games)
+
 (defcustom bubbles-game-theme
   'easy
   "Overall game theme.
@@ -91,8 +95,7 @@ and a shift mode."
                 (const :tag "Medium" medium)
                 (const :tag "Difficult" difficult)
                 (const :tag "Hard" hard)
-                (const :tag "User defined" user-defined))
-  :group 'bubbles)
+                (const :tag "User defined" user-defined)))
 
 (defun bubbles-set-game-easy ()
   "Set game theme to `easy'."
@@ -124,10 +127,6 @@ and a shift mode."
   (setq bubbles-game-theme 'user-defined)
   (bubbles))
 
-(defgroup bubbles nil
-  "Bubbles, a puzzle game."
-  :group 'games)
-
 (defcustom bubbles-graphics-theme
   'circles
   "Graphics theme.
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 9cecb70..5255d81 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -60,7 +60,6 @@
 (defcustom cookie-file nil
   "Default phrase file for cookie functions."
   :type '(choice (const nil) file)
-  :group 'cookie
   :version "24.4")
 
 (defconst cookie-delimiter "\n%%\n\\|\n%\n\\|\0"
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index b870bfb..524ca81 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -99,8 +99,7 @@
   "Non-nil means to convert ciphertext to uppercase.
 nil means the case of the ciphertext is preserved.
 This variable must be set before typing `\\[decipher]'."
-  :type 'boolean
-  :group 'decipher)
+  :type 'boolean)
 
 
 (defcustom decipher-ignore-spaces nil
@@ -108,21 +107,18 @@ This variable must be set before typing `\\[decipher]'."
 You should set this to nil if the cipher message is divided into words,
 or t if it is not.
 This variable is buffer-local."
-  :type 'boolean
-  :group 'decipher)
+  :type 'boolean)
 (make-variable-buffer-local 'decipher-ignore-spaces)
 
 (defcustom decipher-undo-limit 5000
   "The maximum number of entries in the undo list.
 When the undo list exceeds this number, 100 entries are deleted from
 the tail of the list."
-  :type 'integer
-  :group 'decipher)
+  :type 'integer)
 
 (defcustom decipher-mode-hook nil
   "Hook to run upon entry to decipher."
-  :type 'hook
-  :group 'decipher)
+  :type 'hook)
 
 ;; End of user modifiable variables
 ;;--------------------------------------------------------------------
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 3916e35..c3be029 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -42,8 +42,7 @@
                                            (locate-user-emacs-file "games/")))
   "Name of file to store score information for dunnet."
   :version "26.1"
-  :type 'file
-  :group 'dunnet)
+  :type 'file)
 
 ;;;;
 ;;;; This section defines the globals that are used in dunnet.
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index be39e1e..1c2c24a 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -97,35 +97,30 @@ numbers of moves by Black (if considered in isolation) by 
the ellipsis
 conflicts with the use of ellipsis by Outline mode to denote collapsed
 subtrees.  The author uses \":\" because it agrees nicely with a set of
 LaTeX macros he uses for typesetting annotated games."
-  :type 'regexp
-  :group 'gametree)
+  :type 'regexp)
 
 (defcustom gametree-full-ply-regexp (regexp-quote ".")
   "Matches ends of numbers of moves by the \"first\" player.
 For instance, it is an almost universal convention in chess to postfix
 numbers of moves by White (if considered in isolation) by the dot \".\"."
-  :type 'regexp
-  :group 'gametree)
+  :type 'regexp)
 
 (defcustom gametree-half-ply-format "%d:"
   "Output format for move numbers of moves by the \"second\" player.
 Has to contain \"%d\" to output the actual number."
-  :type 'string
-  :group 'gametree)
+  :type 'string)
 
 (defcustom gametree-full-ply-format "%d."
   "Output format for move numbers of moves by the \"first\" player.
 Has to contain \"%d\" to output the actual number."
-  :type 'string
-  :group 'gametree)
+  :type 'string)
 
 (defcustom gametree-make-heading-function
   (lambda (level)
     (insert (make-string level ?*)))
   "A function of one numeric argument, LEVEL, to insert a heading at point.
 You should change this if you change `outline-regexp'."
-  :type 'function
-  :group 'gametree)
+  :type 'function)
 
 (defvar gametree-local-layout nil
   "A list encoding the layout (i.e. the show or hide state) of the file.
@@ -137,18 +132,15 @@ the file is visited (subject to the usual restriction via
 
 (defcustom gametree-score-opener "{score="
   "The string which opens a score tag, and precedes the actual score."
-  :type 'string
-  :group 'gametree)
+  :type 'string)
 
 (defcustom gametree-score-manual-flag "!"
   "String marking the line as manually (as opposed to automatically) scored."
-  :type 'string
-  :group 'gametree)
+  :type 'string)
 
 (defcustom gametree-score-closer "}"
   "The string which closes a score tag, and follows the actual score."
-  :type 'string
-  :group 'gametree)
+  :type 'string)
 
 (defcustom gametree-score-regexp
   (concat "[^\n\^M]*\\("
@@ -166,13 +158,11 @@ line as *manually* (as opposed to automatically) scored, 
which
 prevents the program from recursively applying the scoring algorithm
 on the subtree headed by the marked line, and makes it use the manual
 score instead."
-  :type 'regexp
-  :group 'gametree)
+  :type 'regexp)
 
 (defcustom gametree-default-score 0
   "Score to assume for branches lacking score tags."
-  :type 'integer
-  :group 'gametree)
+  :type 'integer)
 
 ;;;; Helper functions
 
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 1856db8..8db40d7 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -76,8 +76,7 @@
 (defcustom gomoku-mode-hook nil
   "If non-nil, its value is called on entry to Gomoku mode.
 One useful value to include is `turn-on-font-lock' to highlight the pieces."
-  :type 'hook
-  :group 'gomoku)
+  :type 'hook)
 
 ;;;
 ;;; CONSTANTS FOR BOARD
@@ -168,13 +167,11 @@ One useful value to include is `turn-on-font-lock' to 
highlight the pieces."
 
 (defface gomoku-O
     '((((class color)) (:foreground "red" :weight bold)))
-  "Face to use for Emacs's O."
-  :group 'gomoku)
+  "Face to use for Emacs's O.")
 
 (defface gomoku-X
     '((((class color)) (:foreground "green" :weight bold)))
-  "Face to use for your X."
-  :group 'gomoku)
+  "Face to use for your X.")
 
 (defvar gomoku-font-lock-keywords
   '(("O" . 'gomoku-O)
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index d762290..f6e5fcd 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -71,33 +71,33 @@
 
 (defcustom hanoi-horizontal-flag nil
   "If non-nil, hanoi poles are oriented horizontally."
-  :group 'hanoi :type 'boolean)
+  :type 'boolean)
 
 (defcustom hanoi-move-period 1.0
   "Time, in seconds, for each pole-to-pole move of a ring.
 If nil, move rings as fast as possible while displaying all
 intermediate positions."
-  :group 'hanoi :type '(restricted-sexp :match-alternatives (numberp 'nil)))
+  :type '(restricted-sexp :match-alternatives (numberp 'nil)))
 
 (defcustom hanoi-use-faces nil
   "If nil, all hanoi-*-face variables are ignored."
-  :group 'hanoi :type 'boolean)
+  :type 'boolean)
 
 (defcustom hanoi-pole-face 'highlight
   "Face for poles.  Ignored if hanoi-use-faces is nil."
-  :group 'hanoi :type 'face)
+  :type 'face)
 
 (defcustom hanoi-base-face 'highlight
   "Face for base.  Ignored if hanoi-use-faces is nil."
-  :group 'hanoi :type 'face)
+  :type 'face)
 
 (defcustom hanoi-even-ring-face 'region
   "Face for even-numbered rings.  Ignored if hanoi-use-faces is nil."
-  :group 'hanoi :type 'face)
+  :type 'face)
 
 (defcustom hanoi-odd-ring-face 'secondary-selection
   "Face for odd-numbered rings.  Ignored if hanoi-use-faces is nil."
-  :group 'hanoi :type 'face)
+  :type 'face)
 
 
 ;;;