Remove redundant :group args in progmodes/*.el

* lisp/progmodes/bug-reference.el: * lisp/progmodes/cfengine.el: * lisp/progmodes/cmacexp.el: * lisp/progmodes/cpp.el: * lisp/progmodes/cwarn.el: * lisp/progmodes/dcl-mode.el: * lisp/progmodes/executable.el: * lisp/progmodes/flymake.el: * lisp/progmodes/gud.el: * lisp/progmodes/hideshow.el: * lisp/progmodes/icon.el: * lisp/progmodes/inf-lisp.el: * lisp/progmodes/js.el: * lisp/progmodes/ld-script.el: * lisp/progmodes/make-mode.el: * lisp/progmodes/modula2.el: * lisp/progmodes/pascal.el: * lisp/progmodes/perl-mode.el: * lisp/progmodes/prog-mode.el: * lisp/progmodes/simula.el: * lisp/progmodes/xscheme.el: Remove redundant :group args.
author: Stefan Kangas 2021-02-13 05:18:55 +0100
committer: Stefan Kangas 2021-02-13 07:17:20 +0100
commit: b4b9ecdfe366c64a7b95c4fd295b583c3f3c7aa9 (patch)
tree: 65360c882a1620a73585172bfbc6941a1f80bb72
parent: ca0842347e5437bcaeeded4a7fd55e0e48ed4bad (diff)
download: emacs-b4b9ecdfe366c64a7b95c4fd295b583c3f3c7aa9.tar.gz
emacs-b4b9ecdfe366c64a7b95c4fd295b583c3f3c7aa9.zip
21 files changed, 148 insertions, 320 deletions
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index a759394abeb..4d4becf780a 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -73,8 +73,7 @@ so that it is considered safe, see `enable-local-variables'.")
  "Regular expression matching bug references.
 The second subexpression should match the bug reference (usually a number)."
  :type 'regexp
-  :version "24.3"                       ; previously defconst
+  :version "24.3")                      ; previously defconst
-  :group 'bug-reference)
 ;;;###autoload
 (put 'bug-reference-bug-regexp 'safe-local-variable 'stringp)
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index f516664f7f4..bef99f2484b 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -69,7 +69,6 @@
 (defcustom cfengine-indent 2
  "Size of a CFEngine indentation step in columns."
-  :group 'cfengine
  :type 'integer)
 (defcustom cfengine-cf-promises
@@ -86,7 +85,6 @@ Used for syntax discovery and checking.  Set to nil to disable
 the `compile-command' override.  In that case, the ElDoc support
 will use a fallback syntax definition."
  :version "24.4"
-  :group 'cfengine
  :type '(choice file (const nil)))
 (defcustom cfengine-parameters-indent '(promise pname 2)
@@ -145,7 +143,6 @@ bundle agent rcfiles
 }
 "
  :version "24.4"
-  :group 'cfengine
  :type '(list
          (choice (const :tag "Anchor at beginning of promise" promise)
                  (const :tag "Anchor at beginning of line" bol))
@@ -799,7 +796,6 @@ bundle agent rcfiles
 (defcustom cfengine-mode-abbrevs nil
  "Abbrevs for CFEngine2 mode."
-  :group 'cfengine
  :type '(repeat (list (string :tag "Name")
                       (string :tag "Expansion")
                       (choice  :tag "Hook" (const nil) function))))
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 1a45b1cb838..820867ab41f 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -99,13 +99,11 @@
 (defcustom c-macro-shrink-window-flag nil
  "Non-nil means shrink the *Macroexpansion* window to fit its contents."
-  :type 'boolean
+  :type 'boolean)
-  :group 'c-macro)
 (defcustom c-macro-prompt-flag nil
  "Non-nil makes `c-macro-expand' prompt for preprocessor arguments."
-  :type 'boolean
+  :type 'boolean)
-  :group 'c-macro)
 (defcustom c-macro-preprocessor
  (cond ;; Solaris has it in an unusual place.
@@ -129,13 +127,11 @@
 If you change this, be sure to preserve the `-C' (don't strip comments)
 option, or to set an equivalent one."
-  :type 'string
+  :type 'string)
-  :group 'c-macro)
 (defcustom c-macro-cppflags ""
  "Preprocessor flags used by `c-macro-expand'."
-  :type 'string
+  :type 'string)
-  :group 'c-macro)
 (defconst c-macro-buffer-name "*Macroexpansion*")
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index b2c2e8dab57..6602a79b2a4 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -53,8 +53,7 @@
 (defcustom cpp-config-file (convert-standard-filename ".cpp.el")
  "File name to save cpp configuration."
-  :type 'file
+  :type 'file)
-  :group 'cpp)
 (define-widget 'cpp-face 'lazy
  "Either a face or the special symbol `invisible'."
@@ -62,13 +61,11 @@
 (defcustom cpp-known-face 'invisible
  "Face used for known cpp symbols."
-  :type 'cpp-face
+  :type 'cpp-face)
-  :group 'cpp)
 (defcustom cpp-unknown-face 'highlight
  "Face used for unknown cpp symbols."
-  :type 'cpp-face
+  :type 'cpp-face)
-  :group 'cpp)
 (defcustom cpp-face-type 'light
  "Indicate what background face type you prefer.
@@ -76,18 +73,15 @@ Can be either light or dark for color screens, mono for monochrome
 screens, and none if you don't use a window system and don't have
 a color-capable display."
  :options '(light dark mono nil)
-  :type 'symbol
+  :type 'symbol)
-  :group 'cpp)
 (defcustom cpp-known-writable t
  "Non-nil means you are allowed to modify the known conditionals."
-  :type 'boolean
+  :type 'boolean)
-  :group 'cpp)
 (defcustom cpp-unknown-writable t
  "Non-nil means you are allowed to modify the unknown conditionals."
-  :type 'boolean
+  :type 'boolean)
-  :group 'cpp)
 (defcustom cpp-edit-list nil
  "Alist of cpp macros and information about how they should be displayed.
@@ -101,15 +95,13 @@ Each entry is a list with the following elements:
                       (cpp-face :tag "False")
                       (choice (const :tag "True branch writable" t)
                               (const :tag "False branch writable" nil)
-                               (const :tag "Both branches writable" both))))
+                               (const :tag "Both branches writable" both)))))
-  :group 'cpp)
 (defcustom cpp-message-min-time-interval 1.0
  "Minimum time interval in seconds for `cpp-progress-message' messages.
 If nil, `cpp-progress-message' prints no progress messages."
  :type '(choice (const :tag "Disable progress messages" nil)
                 float)
-  :group 'cpp
  :version "26.1")
 (defvar-local cpp-overlay-list nil
@@ -153,36 +145,31 @@ or a cons cell (background-color . COLOR)."
                :value-type (choice face
                                    (const invisible)
                                    (cons (const background-color)
-                                          (string :tag "Color"))))
+                                          (string :tag "Color")))))
-  :group 'cpp)
 (defcustom cpp-face-light-name-list
  '("light gray" "light blue" "light cyan" "light yellow" "light pink"
    "pale green" "beige" "orange" "magenta" "violet" "medium purple"
    "turquoise")
  "Background colors useful with dark foreground colors."
-  :type '(repeat string)
+  :type '(repeat string))
-  :group 'cpp)
 (defcustom cpp-face-dark-name-list
  '("dim gray" "blue" "cyan" "yellow" "red"
    "dark green" "brown" "dark orange" "dark khaki" "dark violet" "purple"
    "dark turquoise")
  "Background colors useful with light foreground colors."
-  :type '(repeat string)
+  :type '(repeat string))
-  :group 'cpp)
 (defcustom cpp-face-light-list nil
  "Alist of names and faces to be used for light backgrounds."
  :type '(repeat (cons string (choice face
-                                      (cons (const background-color) string))))
+                                      (cons (const background-color) string)))))
-  :group 'cpp)
 (defcustom cpp-face-dark-list nil
  "Alist of names and faces to be used for dark backgrounds."
  :type '(repeat (cons string (choice face
-                                      (cons (const background-color) string))))
+                                      (cons (const background-color) string)))))
-  :group 'cpp)
 (defcustom cpp-face-mono-list
  '(("bold" . bold)
@@ -190,15 +177,13 @@ or a cons cell (background-color . COLOR)."
    ("italic" . italic)
    ("underline" . underline))
  "Alist of names and faces to be used for monochrome screens."
-  :type '(repeat (cons string face))
+  :type '(repeat (cons string face)))
-  :group 'cpp)
 (defcustom cpp-face-none-list
   '(("default" . default)
     ("invisible" . invisible))
   "Alist of names and faces available even if you don't use a window system."
-  :type '(repeat (cons string cpp-face))
+  :type '(repeat (cons string cpp-face)))
-  :group 'cpp)
 (defvar cpp-face-all-list
  (append cpp-face-light-list
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 042030da396..63b344bea16 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -128,8 +128,7 @@ on one of three forms:
 See variable `cwarn-font-lock-feature-keywords-alist' for available
 features."
-  :type '(repeat sexp)
+  :type '(repeat sexp))
-  :group 'cwarn)
 (defcustom cwarn-font-lock-feature-keywords-alist
  '((assign    . cwarn-font-lock-assignment-keywords)
@@ -142,15 +141,13 @@ keyword list."
  :type '(alist :key-type (choice (const assign)
                                  (const semicolon)
                                  (const reference))
-                :value-type (sexp :tag "Value"))
+                :value-type (sexp :tag "Value")))
-  :group 'cwarn)
 (defcustom cwarn-verbose t
  "When nil, CWarn mode will not generate any messages.
 Currently, messages are generated when the mode is activated and
 deactivated."
-  :group 'cwarn
  :type 'boolean)
 (defcustom cwarn-mode-text " CWarn"
@@ -158,13 +155,11 @@ deactivated."
 \(When the string is not empty, make sure that it has a leading space.)"
  :tag "CWarn mode text"                ; To separate it from `global-...'
-  :group 'cwarn
  :type 'string)
 (defcustom cwarn-load-hook nil
  "Functions to run when CWarn mode is first loaded."
  :tag "Load Hook"
-  :group 'cwarn
  :type 'hook)
 (make-obsolete-variable 'cwarn-load-hook
                        "use `with-eval-after-load' instead." "28.1")
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 8943d8b6d01..4a8a20a2969 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -97,8 +97,7 @@ dcl-block-begin-regexp and dcl-block-end-regexp.
 The meaning of this variable may be changed if
 dcl-calc-command-indent-function is set to a function."
-  :type 'integer
+  :type 'integer)
-  :group 'dcl)
 (defcustom dcl-continuation-offset 6
@@ -107,8 +106,7 @@ A continuation line is a line that follows a line ending with `-'.
 The meaning of this variable may be changed if
 dcl-calc-cont-indent-function is set to a function."
-  :type 'integer
+  :type 'integer)
-  :group 'dcl)
 (defcustom dcl-margin-offset 8
@@ -117,37 +115,32 @@ The first command line in a file or after a SUBROUTINE statement is indented
 this much.  Other command lines are indented the same number of columns as
 the preceding command line.
 A command line is a line that starts with `$'."
-  :type 'integer
+  :type 'integer)
-  :group 'dcl)
 (defcustom dcl-margin-label-offset 2
  "Number of columns to indent a margin label in DCL.
 A margin label is a label that doesn't begin or end a block, i.e. it
 doesn't match dcl-block-begin-regexp or dcl-block-end-regexp."
-  :type 'integer
+  :type 'integer)
-  :group 'dcl)
 (defcustom dcl-comment-line-regexp "^\\$!"
  "Regexp describing the start of a comment line in DCL.
 Comment lines are not indented."
-  :type 'regexp
+  :type 'regexp)
-  :group 'dcl)
 (defcustom dcl-block-begin-regexp "loop[0-9]*:"
  "Regexp describing a command that begins an indented block in DCL.
 Set to nil to only indent at THEN-ELSE-ENDIF."
-  :type 'regexp
+  :type 'regexp)
-  :group 'dcl)
 (defcustom dcl-block-end-regexp "endloop[0-9]*:"
  "Regexp describing a command that ends an indented block in DCL.
 Set to nil to only indent at THEN-ELSE-ENDIF."
-  :type 'regexp
+  :type 'regexp)
-  :group 'dcl)
 (defcustom dcl-calc-command-indent-function nil
@@ -178,8 +171,7 @@ CUR-INDENT + EXTRA-INDENT.
 This package includes two functions suitable for this:
  dcl-calc-command-indent-multiple
  dcl-calc-command-indent-hang"
-  :type '(choice (const nil) function)
+  :type '(choice (const nil) function))
-  :group 'dcl)
 (defcustom dcl-calc-cont-indent-function 'dcl-calc-cont-indent-relative
@@ -196,8 +188,7 @@ CUR-INDENT + EXTRA-INDENT.
 This package includes one function suitable for this:
  dcl-calc-cont-indent-relative"
-  :type 'function
+  :type 'function)
-  :group 'dcl)
 (defcustom dcl-tab-always-indent t
@@ -206,50 +197,41 @@ If t, pressing TAB always indents the current line.
 If nil, pressing TAB indents the current line if point is at the left margin.
 Data lines (i.e. lines not part of a command line or continuation line) are
 never indented."
-  :type 'boolean
+  :type 'boolean)
-  :group 'dcl)
 (defcustom dcl-electric-characters t
  "Non-nil means reindent immediately when a label, ELSE or ENDIF is inserted."
-  :type 'boolean
+  :type 'boolean)
-  :group 'dcl)
 (defcustom dcl-tempo-comma ", "
  "Text to insert when a comma is needed in a template, in DCL mode."
-  :type 'string
+  :type 'string)
-  :group 'dcl)
 (defcustom dcl-tempo-left-paren "("
  "Text to insert when a left parenthesis is needed in a template in DCL."
-  :type 'string
+  :type 'string)
-  :group 'dcl)
 (defcustom dcl-tempo-right-paren ")"
  "Text to insert when a right parenthesis is needed in a template in DCL."
-  :type 'string
+  :type 'string)
-  :group 'dcl)
 ; I couldn't decide what looked best, so I'll let you decide...
 ; Remember, you can also customize this with imenu-submenu-name-format.
 (defcustom dcl-imenu-label-labels "Labels"
  "Imenu menu title for sub-listing with label names."
-  :type 'string
+  :type 'string)
-  :group 'dcl)
 (defcustom dcl-imenu-label-goto "GOTO"
  "Imenu menu title for sub-listing with GOTO statements."
-  :type 'string
+  :type 'string)
-  :group 'dcl)
 (defcustom dcl-imenu-label-gosub "GOSUB"
  "Imenu menu title for sub-listing with GOSUB statements."
-  :type 'string
+  :type 'string)
-  :group 'dcl)
 (defcustom dcl-imenu-label-call "CALL"
  "Imenu menu title for sub-listing with CALL statements."
-  :type 'string
+  :type 'string)
-  :group 'dcl)
 (defcustom dcl-imenu-generic-expression
  `((nil "^\\$[ \t]*\\([A-Za-z0-9_$]+\\):[ \t]+SUBROUTINE\\b" 1)
@@ -263,14 +245,12 @@ never indented."
 The default includes SUBROUTINE labels in the main listing and
 sub-listings for other labels, CALL, GOTO and GOSUB statements.
 See `imenu-generic-expression' for details."
-  :type '(repeat (sexp :tag "Imenu Expression"))
+  :type '(repeat (sexp :tag "Imenu Expression")))
-  :group 'dcl)
 (defcustom dcl-mode-hook nil
  "Hook called by `dcl-mode'."
-  :type 'hook
+  :type 'hook)
-  :group 'dcl)
 ;;; *** Global variables ****************************************************
@@ -354,16 +334,14 @@ See `imenu-generic-expression' for details."
  "Regular expression describing white space in a DCL command line.
 White space is any number of continued lines with only space,tab,endcomment
 followed by space or tab."
-  :type 'regexp
+  :type 'regexp)
-  :group 'dcl)
 (defcustom dcl-label-r
  "[a-zA-Z0-9_$]*:\\([ \t!]\\|$\\)"
  "Regular expression describing a label.
 A label is a name followed by a colon followed by white-space or end-of-line."
-  :type 'regexp
+  :type 'regexp)
-  :group 'dcl)
 (defcustom dcl-cmd-r
@@ -373,8 +351,7 @@ A line starting with $, optionally followed by continuation lines,
 followed by the end of the command line.
 A continuation line is any characters followed by `-',
 optionally followed by a comment, followed by a newline."
-  :type 'regexp
+  :type 'regexp)
-  :group 'dcl)
 (defcustom dcl-command-regexp
@@ -384,8 +361,7 @@ A line starting with $, optionally followed by continuation lines,
 followed by the end of the command line.
 A continuation line is any characters followed by `-',
 optionally followed by a comment, followed by a newline."
-  :type 'regexp
+  :type 'regexp)
-  :group 'dcl)
 (defcustom dcl-electric-reindent-regexps
@@ -397,8 +373,7 @@ is defined as dcl-electric-character.
 E.g.: if this list contains `endif', the key `f' is defined as
 dcl-electric-character and you have just typed the `f' in
 `endif', the line will be reindented."
-  :type '(repeat regexp)
+  :type '(repeat regexp))
-  :group 'dcl)
 (defvar dcl-option-alist
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index fa5724a3800..b1cd3303c5b 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -65,8 +65,7 @@ update the magic number."
 ;;;   :type '(choice (const :tag "off" nil)
 ;;;              (const :tag "on" t)
 ;;;              symbol)
-  :type 'boolean
+  :type 'boolean)
-  :group 'executable)
 (defcustom executable-query 'function
@@ -74,21 +73,18 @@ update the magic number."
 When this is `function', only ask when called non-interactively."
  :type '(choice (const :tag "Don't Ask" nil)
                 (const :tag "Ask when non-interactive" function)
-                 (other :tag "Ask" t))
+                 (other :tag "Ask" t)))
-  :group 'executable)
 (defcustom executable-magicless-file-regexp "/[Mm]akefile$\\|/\\.\\(z?profile\\|bash_profile\\|z?login\\|bash_login\\|z?logout\\|bash_logout\\|.+shrc\\|esrc\\|rcrc\\|[kz]shenv\\)$"
  "On files with this kind of name no magic is inserted or changed."
-  :type 'regexp
+  :type 'regexp)
-  :group 'executable)
 (defcustom executable-prefix "#!"
  "Interpreter magic number prefix inserted when there was no magic number.
 Use of `executable-prefix-env' is preferable to this option."
  :version "26.1"                       ; deprecated
-  :type 'string
+  :type 'string)
-  :group 'executable)
 (defcustom executable-prefix-env nil
  "If non-nil, use \"/usr/bin/env\" in interpreter magic number.
@@ -96,8 +92,7 @@ If this variable is non-nil, the interpreter magic number inserted
 by `executable-set-magic' will be \"#!/usr/bin/env INTERPRETER\",
 otherwise it will be \"#!/path/to/INTERPRETER\"."
  :version "26.1"
-  :type 'boolean
+  :type 'boolean)
-  :group 'executable)
 (defcustom executable-chmod 73
  "After saving, if the file is not executable, set this mode.
@@ -105,8 +100,7 @@ This mode passed to `set-file-modes' is taken absolutely when negative, or
 relative to the files existing modes.  Do nothing if this is nil.
 Typical values are 73 (+x) or -493 (rwxr-xr-x)."
  :type '(choice integer
-                 (const nil))
+                 (const nil)))
-  :group 'executable)
 (defvar executable-command nil)
@@ -114,8 +108,7 @@ Typical values are 73 (+x) or -493 (rwxr-xr-x)."
 (defcustom executable-self-display "tail"
  "Command you use with argument `-n+2' to make text files self-display.
 Note that the like of `more' doesn't work too well under Emacs \\[shell]."
-  :type 'string
+  :type 'string)
-  :group 'executable)
 (make-obsolete-variable 'executable-self-display nil "25.1" 'set)
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 5d96c62b418..b8c8a827eed 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1198,7 +1198,6 @@ default) no filter is applied."
  '(" " flymake-mode-line-title flymake-mode-line-exception
    flymake-mode-line-counters)
  "Mode line construct for customizing Flymake information."
-  :group 'flymake
  :type '(repeat (choice string symbol)))
 (defcustom flymake-mode-line-counter-format
@@ -1210,7 +1209,6 @@ default) no filter is applied."
 This is a suitable place for placing the `flymake-error-counter',
 `flymake-warning-counter' and `flymake-note-counter' constructs.
 Separating each of these with space is not necessary."
-  :group 'flymake
  :type '(repeat (choice string symbol)))
 (defvar flymake-mode-line-title '(:eval (flymake--mode-line-title))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index eb114acdabc..b105cbaa0ef 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -64,8 +64,7 @@ pdb (Python), and jdb."
 (defcustom gud-key-prefix "\C-x\C-a"
  "Prefix of all GUD commands valid in C buffers."
-  :type 'key-sequence
+  :type 'key-sequence)
-  :group 'gud)
 (global-set-key (vconcat gud-key-prefix "\C-l") 'gud-refresh)
 ;; (define-key ctl-x-map " " 'gud-break); backward compatibility hack
@@ -1074,8 +1073,7 @@ The file names should be absolute, or relative to the directory
 containing the executable being debugged."
  :type '(choice (const :tag "Current Directory" nil)
                 (repeat :value ("")
-                         directory))
+                         directory)))
-  :group 'gud)
 (defun gud-dbx-massage-args (_file args)
  (nconc (let ((directories gud-dbx-directories)
@@ -1380,8 +1378,7 @@ The file names should be absolute, or relative to the directory
 containing the executable being debugged."
  :type '(choice (const :tag "Current Directory" nil)
                 (repeat :value ("")
-                         directory))
+                         directory)))
-  :group 'gud)
 (defun gud-xdb-massage-args (_file args)
  (nconc (let ((directories gud-xdb-directories)
@@ -1563,8 +1560,7 @@ into one that invokes an Emacs-enabled debugging session.
 (defcustom gud-perldb-command-name "perl -d"
  "Default command to execute a Perl script under debugger."
-  :type 'string
+  :type 'string)
-  :group 'gud)
 ;;;###autoload
 (defun perldb (command-line)
@@ -1677,8 +1673,7 @@ and source-file directory for your debugger."
  (if (executable-find "pdb") "pdb" "python -m pdb")
  "Command that executes the Python debugger."
  :version "27.1"
-  :type 'string
+  :type 'string)
-  :group 'gud)
 ;;;###autoload
 (defun pdb (command-line)
@@ -1759,8 +1754,7 @@ directory and source-file directory for your debugger."
  "File name for executing the Guile debugger.
 This should be an executable on your path, or an absolute file name."
  :version "25.1"
-  :type 'string
+  :type 'string)
-  :group 'gud)
 ;;;###autoload
 (defun guiler (command-line)
@@ -1883,8 +1877,7 @@ and source-file directory for your debugger."
 (defcustom gud-jdb-command-name "jdb"
  "Command that executes the Java debugger."
-  :type 'string
+  :type 'string)
-  :group 'gud)
 (defcustom gud-jdb-use-classpath t
  "If non-nil, search for Java source files in classpath directories.
@@ -1899,8 +1892,7 @@ and parsing all Java files for class information.
 Set to nil to use `gud-jdb-directories' to scan java sources for
 class information on jdb startup (original method)."
-  :type 'boolean
+  :type 'boolean)
-  :group 'gud)
 (defvar gud-jdb-classpath nil
  "Java/jdb classpath directories list.
@@ -2584,7 +2576,6 @@ Commands:
 (defcustom gud-chdir-before-run t
  "Non-nil if GUD should `cd' to the debugged executable."
-  :group 'gud
  :type 'boolean)
 ;; Perform initializations common to all debuggers.
@@ -3419,7 +3410,6 @@ Treats actions as defuns."
                                        python-mode)
  "List of modes for which to enable GUD tooltips."
  :type '(repeat (symbol :tag "Major mode"))
-  :group 'gud
  :group 'tooltip)
 (defcustom gud-tooltip-display
@@ -3431,13 +3421,11 @@ Forms in the list are combined with AND.  The default is to display
 only tooltips in the buffer containing the overlay arrow."
  :type 'sexp
  :risky t
-  :group 'gud
  :group 'tooltip)
 (defcustom gud-tooltip-echo-area nil
  "Use the echo area instead of frames for GUD tooltips."
  :type 'boolean
-  :group 'gud
  :group 'tooltip)
 (make-obsolete-variable 'gud-tooltip-echo-area
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 73d09e00591..81ba0d86954 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -232,13 +232,11 @@
 (defcustom hs-hide-comments-when-hiding-all t
  "Hide the comments too when you do an `hs-hide-all'."
-  :type 'boolean
+  :type 'boolean)
-  :group 'hideshow)
 (defcustom hs-minor-mode-hook nil
  "Hook called when hideshow minor mode is activated or deactivated."
  :type 'hook
-  :group 'hideshow
  :version "21.1")
 (defcustom hs-isearch-open 'code
@@ -254,8 +252,7 @@ This has effect only if `search-invisible' is set to `open'."
  :type '(choice (const :tag "open only code blocks" code)
                 (const :tag "open only comment blocks" comment)
                 (const :tag "open both code and comment blocks" t)
-                 (const :tag "don't open any of them" nil))
+                 (const :tag "don't open any of them" nil)))
-  :group 'hideshow)
 ;;;###autoload
 (defvar hs-special-modes-alist
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index 933cb333dfb..a36f020439d 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -86,42 +86,35 @@
 (defcustom icon-indent-level 4
  "Indentation of Icon statements with respect to containing block."
-  :type 'integer
+  :type 'integer)
-  :group 'icon)
 (defcustom icon-brace-imaginary-offset 0
  "Imagined indentation of an Icon open brace that actually follows a statement."
-  :type 'integer
+  :type 'integer)
-  :group 'icon)
 (defcustom icon-brace-offset 0
  "Extra indentation for braces, compared with other text in same context."
-  :type 'integer
+  :type 'integer)
-  :group 'icon)
 (defcustom icon-continued-statement-offset 4
  "Extra indent for Icon lines not starting new statements."
-  :type 'integer
+  :type 'integer)
-  :group 'icon)
 (defcustom icon-continued-brace-offset 0
  "Extra indent for Icon substatements that start with open-braces.
 This is in addition to `icon-continued-statement-offset'."
-  :type 'integer
+  :type 'integer)
-  :group 'icon)
 (defcustom icon-auto-newline nil
  "Non-nil means automatically newline before and after braces Icon code.
 This applies when braces are inserted."
-  :type 'boolean
+  :type 'boolean)
-  :group 'icon)
 (defcustom icon-tab-always-indent t
  "Non-nil means TAB in Icon mode should always reindent the current line.
 It will then reindent, regardless of where in the line point is
 when the TAB command is used."
-  :type 'boolean
+  :type 'boolean)
-  :group 'icon)
 (defvar icon-imenu-generic-expression
      '((nil "^[ \t]*procedure[ \t]+\\(\\sw+\\)[ \t]*("  1))
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index ac230596240..146ed4dca4a 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -76,8 +76,7 @@
 Input matching this regexp is not saved on the input history in Inferior Lisp
 mode.  Default is whitespace followed by 0 or 1 single-letter colon-keyword
 \(as in :a, :c, etc.)"
-  :type 'regexp
+  :type 'regexp)
-  :group 'inferior-lisp)
 (defvar inferior-lisp-mode-map
  (let ((map (copy-keymap comint-mode-map)))
@@ -155,8 +154,7 @@ mode.  Default is whitespace followed by 0 or 1 single-letter colon-keyword
 (defcustom inferior-lisp-program "lisp"
  "Program name for invoking an inferior Lisp in Inferior Lisp mode."
-  :type 'string
+  :type 'string)
-  :group 'inferior-lisp)
 (defcustom inferior-lisp-load-command "(load \"%s\")\n"
  "Format-string for building a Lisp expression to load a file.
@@ -166,8 +164,7 @@ to load that file.  The default works acceptably on most Lisps.
 The string \"(progn (load \\\"%s\\\" :verbose nil :print t) (values))\\n\"
 produces cosmetically superior output for this application,
 but it works only in Common Lisp."
-  :type 'string
+  :type 'string)
-  :group 'inferior-lisp)
 (defcustom inferior-lisp-prompt "^[^> \n]*>+:? *"
  "Regexp to recognize prompts in the Inferior Lisp mode.
@@ -182,8 +179,7 @@ More precise choices:
 Lucid Common Lisp: \"^\\\\(>\\\\|\\\\(->\\\\)+\\\\) *\"
 franz: \"^\\\\(->\\\\|<[0-9]*>:\\\\) *\"
 kcl: \"^>+ *\""
-  :type 'regexp
+  :type 'regexp)
-  :group 'inferior-lisp)
 (defvar inferior-lisp-buffer nil "*The current inferior-lisp process buffer.
@@ -487,8 +483,7 @@ describing the last `lisp-load-file' or `lisp-compile-file' command.")
 If it's loaded into a buffer that is in one of these major modes, it's
 considered a Lisp source file by `lisp-load-file' and `lisp-compile-file'.
 Used by these commands to determine defaults."
-  :type '(repeat symbol)
+  :type '(repeat symbol))
-  :group 'inferior-lisp)
 (defun lisp-load-file (file-name)
  "Load a Lisp file into the inferior Lisp process."
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index cdf6536fc7e..21bda086801 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -427,22 +427,19 @@ Match group 1 is the name of the macro.")
 (defcustom js-indent-level 4
  "Number of spaces for each indentation step in `js-mode'."
  :type 'integer
-  :safe 'integerp
+  :safe 'integerp)
-  :group 'js)
 (defcustom js-expr-indent-offset 0
  "Number of additional spaces for indenting continued expressions.
 The value must be no less than minus `js-indent-level'."
  :type 'integer
-  :safe 'integerp
+  :safe 'integerp)
-  :group 'js)
 (defcustom js-paren-indent-offset 0
  "Number of additional spaces for indenting expressions in parentheses.
 The value must be no less than minus `js-indent-level'."
  :type 'integer
  :safe 'integerp
-  :group 'js
  :version "24.1")
 (defcustom js-square-indent-offset 0
@@ -450,7 +447,6 @@ The value must be no less than minus `js-indent-level'."
 The value must be no less than minus `js-indent-level'."
  :type 'integer
  :safe 'integerp
-  :group 'js
  :version "24.1")
 (defcustom js-curly-indent-offset 0
@@ -458,7 +454,6 @@ The value must be no less than minus `js-indent-level'."
 The value must be no less than minus `js-indent-level'."
  :type 'integer
  :safe 'integerp
-  :group 'js
  :version "24.1")
 (defcustom js-switch-indent-offset 0
@@ -466,26 +461,22 @@ The value must be no less than minus `js-indent-level'."
 The value must not be negative."
  :type 'integer
  :safe 'integerp
-  :group 'js
  :version "24.4")
 (defcustom js-flat-functions nil
  "Treat nested functions as top-level functions in `js-mode'.
 This applies to function movement, marking, and so on."
-  :type 'boolean
+  :type 'boolean)
-  :group 'js)
 (defcustom js-indent-align-list-continuation t
  "Align continuation of non-empty ([{ lines in `js-mode'."
  :version "26.1"
  :type 'boolean
-  :safe 'booleanp
+  :safe 'booleanp)
-  :group 'js)
 (defcustom js-comment-lineup-func #'c-lineup-C-comments
  "Lineup function for `cc-mode-style', for C comments in `js-mode'."
-  :type 'function
+  :type 'function)
-  :group 'js)
 (defcustom js-enabled-frameworks js--available-frameworks
  "Frameworks recognized by `js-mode'.
@@ -493,30 +484,26 @@ To improve performance, you may turn off some frameworks you
 seldom use, either globally or on a per-buffer basis."
  :type (cons 'set (mapcar (lambda (x)
                             (list 'const x))
-                           js--available-frameworks))
+                           js--available-frameworks)))
-  :group 'js)
 (defcustom js-js-switch-tabs
  (and (memq system-type '(darwin)) t)
  "Whether `js-mode' should display tabs while selecting them.
 This is useful only if the windowing system has a good mechanism
 for preventing Firefox from stealing the keyboard focus."
-  :type 'boolean
+  :type 'boolean)
-  :group 'js)
 (defcustom js-js-tmpdir
  "~/.emacs.d/js/js"
  "Temporary directory used by `js-mode' to communicate with Mozilla.
 This directory must be readable and writable by both Mozilla and Emacs."
-  :type 'directory
+  :type 'directory)
-  :group 'js)
 (defcustom js-js-timeout 5
  "Reply timeout for executing commands in Mozilla via `js-mode'.
 The value is given in seconds.  Increase this value if you are
 getting timeout messages."
-  :type 'integer
+  :type 'integer)
-  :group 'js)
 (defcustom js-indent-first-init nil
  "Non-nil means specially indent the first variable declaration's initializer.
@@ -557,8 +544,7 @@ don't indent the first one's initializer; otherwise, indent it.
      bar = 2;"
  :version "25.1"
  :type '(choice (const nil) (const t) (const dynamic))
-  :safe 'symbolp
+  :safe 'symbolp)
-  :group 'js)
 (defcustom js-chain-indent nil
  "Use \"chained\" indentation.
@@ -571,8 +557,7 @@ then the \".\"s will be lined up:
 "
  :version "26.1"
  :type 'boolean
-  :safe 'booleanp
+  :safe 'booleanp)
-  :group 'js)
 (defcustom js-jsx-detect-syntax t
  "When non-nil, automatically detect whether JavaScript uses JSX.
@@ -581,8 +566,7 @@ t.  The detection strategy can be customized by adding elements
 to `js-jsx-regexps', which see."
  :version "27.1"
  :type 'boolean
-  :safe 'booleanp
+  :safe 'booleanp)
-  :group 'js)
 (defcustom js-jsx-syntax nil
  "When non-nil, parse JavaScript with consideration for JSX syntax.
@@ -600,8 +584,7 @@ When `js-mode' is already enabled, you should call
 It is set to be buffer-local (and t) when in `js-jsx-mode'."
  :version "27.1"
  :type 'boolean
-  :safe 'booleanp
+  :safe 'booleanp)
-  :group 'js)
 (defcustom js-jsx-align->-with-< t
  "When non-nil, “>” will be indented to the opening “<” in JSX.
@@ -625,8 +608,7 @@ When this is disabled, JSX indentation looks like this:
    />"
  :version "27.1"
  :type 'boolean
-  :safe 'booleanp
+  :safe 'booleanp)
-  :group 'js)
 (defcustom js-jsx-indent-level nil
  "When non-nil, indent JSX by this value, instead of like JS.
@@ -655,8 +637,7 @@ indentation looks like this (different):
  :version "27.1"
  :type '(choice integer
                 (const :tag "Not Set" nil))
-  :safe (lambda (x) (or (null x) (integerp x)))
+  :safe (lambda (x) (or (null x) (integerp x))))
-  :group 'js)
 ;; This is how indentation behaved out-of-the-box until Emacs 27.  JSX
 ;; indentation was controlled with `sgml-basic-offset', which defaults
 ;; to 2, whereas `js-indent-level' defaults to 4.  Users who had the
@@ -685,8 +666,7 @@ indentation looks like this:
 This variable is like `sgml-attribute-offset'."
  :version "27.1"
  :type 'integer
-  :safe 'integerp
+  :safe 'integerp)
-  :group 'js)
 ;;; KeyMap
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index c4ea8e158d8..485e64e2492 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -35,8 +35,7 @@
 (defvar ld-script-location-counter-face 'ld-script-location-counter)
 (defface ld-script-location-counter
  '((t :weight bold :inherit font-lock-builtin-face))
-  "Face for location counter in GNU ld script."
+  "Face for location counter in GNU ld script.")
-  :group 'ld-script)
 ;; Syntax rules
 (defvar ld-script-mode-syntax-table
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index e382d6edcd2..3d1e7d634a2 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -101,14 +101,12 @@
 (defface makefile-space
  '((((class color)) (:background  "hotpink"))
    (t (:reverse-video t)))
-  "Face to use for highlighting leading spaces in Font-Lock mode."
+  "Face to use for highlighting leading spaces in Font-Lock mode.")
-  :group 'makefile)
 (defface makefile-targets
  ;; This needs to go along both with foreground and background colors (i.e. shell)
  '((t (:inherit font-lock-function-name-face)))
  "Face to use for additionally highlighting rule targets in Font-Lock mode."
-  :group 'makefile
  :version "22.1")
 (defface makefile-shell
@@ -116,7 +114,6 @@
  ;;'((((class color) (min-colors 88) (background light)) (:background  "seashell1"))
  ;;  (((class color) (min-colors 88) (background dark)) (:background  "seashell4")))
  "Face to use for additionally highlighting Shell commands in Font-Lock mode."
-  :group 'makefile
  :version "22.1")
 (defface makefile-makepp-perl
@@ -124,19 +121,16 @@
    (((class color) (background dark)) (:background  "DarkBlue"))
    (t (:reverse-video t)))
  "Face to use for additionally highlighting Perl code in Font-Lock mode."
-  :group 'makefile
  :version "22.1")
 (defcustom makefile-browser-buffer-name "*Macros and Targets*"
  "Name of the macro- and target browser buffer."
-  :type 'string
+  :type 'string)
-  :group 'makefile)
 (defcustom makefile-target-colon ":"
  "String to append to all target names inserted by `makefile-insert-target'.
 \":\" or \"::\" are common values."
-  :type 'string
+  :type 'string)
-  :group 'makefile)
 (defcustom makefile-macro-assign " = "
  "String to append to all macro names inserted by `makefile-insert-macro'.
@@ -144,70 +138,58 @@ The normal value should be \" = \", since this is what
 standard make expects.  However, newer makes such as dmake
 allow a larger variety of different macro assignments, so you
 might prefer to use \" += \" or \" := \" ."
-  :type 'string
+  :type 'string)
-  :group 'makefile)
 (defcustom makefile-electric-keys nil
  "If non-nil, Makefile mode should install electric keybindings.
 Default is nil."
-  :type 'boolean
+  :type 'boolean)
-  :group 'makefile)
 (defcustom makefile-use-curly-braces-for-macros-p nil
  "Controls the style of generated macro references.
 Non-nil means macro references should use curly braces, like `${this}'.
 nil means use parentheses, like `$(this)'."
-  :type 'boolean
+  :type 'boolean)
-  :group 'makefile)
 (defcustom makefile-tab-after-target-colon t
  "If non-nil, insert a TAB after a target colon.
 Otherwise, a space is inserted.
 The default is t."
-  :type 'boolean
+  :type 'boolean)
-  :group 'makefile)
 (defcustom makefile-browser-leftmost-column 10
  "Number of blanks to the left of the browser selection mark."
-  :type 'integer
+  :type 'integer)
-  :group 'makefile)
 (defcustom makefile-browser-cursor-column 10
  "Column the cursor goes to when it moves up or down in the Makefile browser."
-  :type 'integer
+  :type 'integer)
-  :group 'makefile)
 (defcustom makefile-backslash-column 48
  "Column in which `makefile-backslash-region' inserts backslashes."
-  :type 'integer
+  :type 'integer)
-  :group 'makefile)
 (defcustom makefile-backslash-align t
  "If non-nil, `makefile-backslash-region' will align backslashes."
-  :type 'boolean
+  :type 'boolean)
-  :group 'makefile)
 (defcustom makefile-browser-selected-mark "+  "
  "String used to mark selected entries in the Makefile browser."
-  :type 'string
+  :type 'string)
-  :group 'makefile)
 (defcustom makefile-browser-unselected-mark "   "
  "String used to mark unselected entries in the Makefile browser."
-  :type 'string
+  :type 'string)
-  :group 'makefile)
 (defcustom makefile-browser-auto-advance-after-selection-p t
  "If non-nil, cursor will move after item is selected in Makefile browser."
-  :type 'boolean
+  :type 'boolean)
-  :group 'makefile)
 (defcustom makefile-pickup-everything-picks-up-filenames-p nil
  "If non-nil, `makefile-pickup-everything' picks up filenames as targets.
 This means it calls `makefile-pickup-filenames-as-targets'.
 Otherwise filenames are omitted."
-  :type 'boolean
+  :type 'boolean)
-  :group 'makefile)
 (defcustom makefile-cleanup-continuations nil
  "If non-nil, automatically clean up continuation lines when saving.
@@ -215,13 +197,11 @@ A line is cleaned up by removing all whitespace following a trailing
 backslash.  This is done silently.
 IMPORTANT: Please note that enabling this option causes Makefile mode
 to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"."
-  :type 'boolean
+  :type 'boolean)
-  :group 'makefile)
 (defcustom makefile-mode-hook nil
  "Normal hook run by `makefile-mode'."
-  :type 'hook
+  :type 'hook)
-  :group 'makefile)
 (defvar makefile-browser-hook '())
@@ -240,8 +220,7 @@ to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"."
  "List of special targets.
 You will be offered to complete on one of those in the minibuffer whenever
 you enter a \".\" at the beginning of a line in `makefile-mode'."
-  :type '(repeat string)
+  :type '(repeat string))
-  :group 'makefile)
 (put 'makefile-special-targets-list 'risky-local-variable t)
 (defcustom makefile-runtime-macros-list
@@ -250,8 +229,7 @@ you enter a \".\" at the beginning of a line in `makefile-mode'."
 If you insert a macro reference using `makefile-insert-macro-ref', the name
 of the macro is checked against this list.  If it can be found its name will
 not be enclosed in { } or ( )."
-  :type '(repeat (list string))
+  :type '(repeat (list string)))
-  :group 'makefile)
 ;; Note that the first big subexpression is used by font lock.  Note
 ;; that if you change this regexp you might have to fix the imenu
@@ -563,8 +541,7 @@ not be enclosed in { } or ( )."
 (defcustom makefile-brave-make "make"
  "How to invoke make, for `makefile-query-targets'.
 This should identify a `make' command that can handle the `-q' option."
-  :type 'string
+  :type 'string)
-  :group 'makefile)
 (defvaralias 'makefile-query-one-target-method
  'makefile-query-one-target-method-function)
@@ -584,13 +561,11 @@ The function must satisfy this calling convention:
 * It must return the integer value 0 (zero) if the given target
  should be considered up-to-date in the context of the given
  makefile, any nonzero integer value otherwise."
-  :type 'function
+  :type 'function)
-  :group 'makefile)
 (defcustom makefile-up-to-date-buffer-name "*Makefile Up-to-date overview*"
  "Name of the Up-to-date overview buffer."
-  :type 'string
+  :type 'string)
-  :group 'makefile)
 ;;; --- end of up-to-date-overview configuration ------------------
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index a77a4e2b216..536d3be0056 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -51,23 +51,19 @@
 (defcustom m2-compile-command "m2c"
  "Command to compile Modula-2 programs."
-  :type 'string
+  :type 'string)
-  :group 'modula2)
 (defcustom m2-link-command "m2l"
  "Command to link Modula-2 programs."
-  :type 'string
+  :type 'string)
-  :group 'modula2)
 (defcustom m2-link-name nil
  "Name of the Modula-2 executable."
-  :type '(choice (const nil) string)
+  :type '(choice (const nil) string))
-  :group 'modula2)
 (defcustom m2-end-comment-column 75
  "Column for aligning the end of a comment, in Modula-2."
-  :type 'integer
+  :type 'integer)
-  :group 'modula2)
 ;;; Added by TEP
 (defvar m2-mode-map
@@ -105,8 +101,7 @@
 (defcustom m2-indent 5
  "This variable gives the indentation in Modula-2 mode."
-  :type 'integer
+  :type 'integer)
-  :group 'modula2)
 (put 'm2-indent 'safe-local-variable
     (lambda (v) (or (null v) (integerp v))))
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 59f90d7293b..e6e6e40aa19 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -199,38 +199,32 @@
 (defcustom pascal-indent-level 3
  "Indentation of Pascal statements with respect to containing block."
-  :type 'integer
+  :type 'integer)
-  :group 'pascal)
 (defcustom pascal-case-indent 2
  "Indentation for case statements."
-  :type 'integer
+  :type 'integer)
-  :group 'pascal)
 (defcustom pascal-auto-newline nil
  "Non-nil means automatically insert newlines in certain cases.
 These include after semicolons and after the punctuation mark after an `end'."
-  :type 'boolean
+  :type 'boolean)
-  :group 'pascal)
 (defcustom pascal-indent-nested-functions t
  "Non-nil means nested functions are indented."
-  :type 'boolean
+  :type 'boolean)
-  :group 'pascal)
 (defcustom pascal-tab-always-indent t
  "Non-nil means TAB in Pascal mode should always reindent the current line.
 If this is nil, TAB inserts a tab if it is at the end of the line
 and follows non-whitespace text."
-  :type 'boolean
+  :type 'boolean)
-  :group 'pascal)
 (defcustom pascal-auto-endcomments t
  "Non-nil means automatically insert comments after certain `end's.
 Specifically, this is done after the ends of case statements and functions.
 The name of the function or case is included between the braces."
-  :type 'boolean
+  :type 'boolean)
-  :group 'pascal)
 (defcustom pascal-auto-lineup '(all)
  "List of contexts where auto lineup of :'s or ='s should be done.
@@ -243,8 +237,7 @@ will do all lineups."
              (const :tag "Everything" all)
              (const :tag "Parameter lists" paramlist)
              (const :tag "Declarations" declaration)
-              (const :tag "Case statements" case))
+              (const :tag "Case statements" case)))
-  :group 'pascal)
 (defvar pascal-toggle-completions nil
  "If non-nil, `pascal-complete-word' tries all possible completions.
@@ -260,8 +253,7 @@ completions.")
 These include integer, real, char, etc.
 The types defined within the Pascal program
 are handled in another way, and should not be added to this list."
-  :type '(repeat (string :tag "Keyword"))
+  :type '(repeat (string :tag "Keyword")))
-  :group 'pascal)
 (defcustom pascal-start-keywords
  '("begin" "end" "function" "procedure" "repeat" "until" "while"
@@ -270,8 +262,7 @@ are handled in another way, and should not be added to this list."
 These are keywords such as begin, repeat, until, readln.
 The procedures and variables defined within the Pascal program
 are handled in another way, and should not be added to this list."
-  :type '(repeat (string :tag "Keyword"))
+  :type '(repeat (string :tag "Keyword")))
-  :group 'pascal)
 (defcustom pascal-separator-keywords
  '("downto" "else" "mod" "div" "then")
@@ -279,8 +270,7 @@ are handled in another way, and should not be added to this list."
 These are keywords such as downto, else, mod, then.
 Variables and function names defined within the Pascal program
 are handled in another way, and should not be added to this list."
-  :type '(repeat (string :tag "Keyword"))
+  :type '(repeat (string :tag "Keyword")))
-  :group 'pascal)
 ;;;
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 0120e4a7cd1..c7fa5ab84b0 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -98,8 +98,7 @@
 (defface perl-non-scalar-variable
  '((t :inherit font-lock-variable-name-face :underline t))
  "Face used for non-scalar variables."
-  :version "28.1"
+  :version "28.1")
-  :group 'perl)
 (defvar perl-mode-abbrev-table nil
  "Abbrev table in use in perl-mode buffers.")
@@ -640,7 +639,6 @@ This is a non empty list of strings, the checker tool possibly
 followed by required arguments.  Once launched it will receive
 the Perl source to be checked as its standard input."
  :version "26.1"
-  :group 'perl
  :type '(repeat string))
 (defvar-local perl--flymake-proc nil)
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index d88d3505586..19de7545bf3 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -41,8 +41,7 @@
  :type 'hook
  :options '(flyspell-prog-mode abbrev-mode flymake-mode
                                display-line-numbers-mode
-                                prettify-symbols-mode)
+                                prettify-symbols-mode))
-  :group 'prog-mode)
 (defvar prog-mode-map
  (let ((map (make-sparse-keymap)))
@@ -166,8 +165,7 @@ on the symbol."
  :version "25.1"
  :type '(choice (const :tag "Never unprettify" nil)
                 (const :tag "Unprettify when point is inside" t)
-                 (const :tag "Unprettify when point is inside or at right edge" right-edge))
+                 (const :tag "Unprettify when point is inside or at right edge" right-edge)))
-  :group 'prog-mode)
 (defun prettify-symbols--post-command-hook ()
  (cl-labels ((get-prop-as-list
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index a863e7eb4b4..fab600f83f4 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -51,16 +51,14 @@ the run of whitespace at the beginning of the line.")
  "Non-nil means TAB in SIMULA mode should always reindent the current line.
 Otherwise TAB indents only when point is within
 the run of whitespace at the beginning of the line."
-  :type 'boolean
+  :type 'boolean)
-  :group 'simula)
 (defconst simula-indent-level-default 3
  "Indentation of SIMULA statements with respect to containing block.")
 (defcustom simula-indent-level simula-indent-level-default
  "Indentation of SIMULA statements with respect to containing block."
-  :type 'integer
+  :type 'integer)
-  :group 'simula)
 (defconst simula-substatement-offset-default 3
@@ -68,8 +66,7 @@ the run of whitespace at the beginning of the line."
 (defcustom simula-substatement-offset simula-substatement-offset-default
  "Extra indentation after DO, THEN, ELSE, WHEN and OTHERWISE."
-  :type 'integer
+  :type 'integer)
-  :group 'simula)
 (defconst simula-continued-statement-offset-default 3
  "Extra indentation for lines not starting a statement or substatement.
@@ -83,16 +80,14 @@ the previous line of the statement.")
 If value is a list, each line in a multipleline continued statement
 will have the car of the list extra indentation with respect to
 the previous line of the statement."
-  :type 'integer
+  :type 'integer)
-  :group 'simula)
 (defconst simula-label-offset-default -4711
  "Offset of SIMULA label lines relative to usual indentation.")
 (defcustom simula-label-offset simula-label-offset-default
  "Offset of SIMULA label lines relative to usual indentation."
-  :type 'integer
+  :type 'integer)
-  :group 'simula)
 (defconst simula-if-indent-default '(0 . 0)
  "Extra indentation of THEN and ELSE with respect to the starting IF.
@@ -103,8 +98,7 @@ extra ELSE indentation.  IF after ELSE is indented as the starting IF.")
  "Extra indentation of THEN and ELSE with respect to the starting IF.
 Value is a cons cell, the car is extra THEN indentation and the cdr
 extra ELSE indentation.  IF after ELSE is indented as the starting IF."
-  :type '(cons integer integer)
+  :type '(cons integer integer))
-  :group 'simula)
 (defconst simula-inspect-indent-default '(0 . 0)
  "Extra indentation of WHEN and OTHERWISE with respect to the INSPECT.
@@ -115,16 +109,14 @@ and the cdr extra OTHERWISE indentation.")
  "Extra indentation of WHEN and OTHERWISE with respect to the INSPECT.
 Value is a cons cell, the car is extra WHEN indentation
 and the cdr extra OTHERWISE indentation."
-  :type '(cons integer integer)
+  :type '(cons integer integer))
-  :group 'simula)
 (defconst simula-electric-indent-default nil
  "Non-nil means `simula-indent-line' function may reindent previous line.")
 (defcustom simula-electric-indent simula-electric-indent-default
  "Non-nil means `simula-indent-line' function may reindent previous line."
-  :type 'boolean
+  :type 'boolean)
-  :group 'simula)
 (defconst simula-abbrev-keyword-default 'upcase
  "Specify how to convert case for SIMULA keywords.
@@ -135,8 +127,7 @@ Value is one of the symbols `upcase', `downcase', `capitalize',
  "Specify how to convert case for SIMULA keywords.
 Value is one of the symbols `upcase', `downcase', `capitalize',
 \(as in) `abbrev-table' or nil if they should not be changed."
-  :type '(choice (const upcase) (const downcase) (const capitalize)(const nil))
+  :type '(choice (const upcase) (const downcase) (const capitalize)(const nil)))
-  :group 'simula)
 (defconst simula-abbrev-stdproc-default 'abbrev-table
  "Specify how to convert case for standard SIMULA procedure and class names.
@@ -148,16 +139,14 @@ Value is one of the symbols `upcase', `downcase', `capitalize',
 Value is one of the symbols `upcase', `downcase', `capitalize',
 \(as in) `abbrev-table', or nil if they should not be changed."
  :type '(choice (const upcase) (const downcase) (const capitalize)
-          (const abbrev-table) (const nil))
+          (const abbrev-table) (const nil)))
-  :group 'simula)
 (defcustom simula-abbrev-file nil
  "File with extra abbrev definitions for use in SIMULA mode.
 These are used together with the standard abbrev definitions for SIMULA.
 Please note that the standard definitions are required
 for SIMULA mode to function correctly."
-  :type '(choice file (const nil))
+  :type '(choice file (const nil)))
-  :group 'simula)
 (defvar simula-mode-syntax-table nil
  "Syntax table in SIMULA mode buffers.")
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index e85e3cfdbbd..613863dd613 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -104,20 +104,17 @@ reading-string         reading prompt string")
 (defcustom scheme-band-name nil
  "Band loaded by the `run-scheme' command."
-  :type '(choice (const nil) string)
+  :type '(choice (const nil) string))
-  :group 'xscheme)
 (defcustom scheme-program-arguments nil
  "Arguments passed to the Scheme program by the `run-scheme' command."
-  :type '(choice (const nil) string)
+  :type '(choice (const nil) string))
-  :group 'xscheme)
 (defcustom xscheme-allow-pipelined-evaluation t
  "If non-nil, an expression may be transmitted while another is evaluating.
 Otherwise, attempting to evaluate an expression before the previous expression
 has finished evaluating will signal an error."
-  :type 'boolean
+  :type 'boolean)
-  :group 'xscheme)
 (defcustom xscheme-startup-message
  "This is the Scheme process buffer.
@@ -128,19 +125,16 @@ Type \\[describe-mode] for more information.
 "
  "String to insert into Scheme process buffer first time it is started.
 Is processed with `substitute-command-keys' first."
-  :type 'string
+  :type 'string)
-  :group 'xscheme)
 (defcustom xscheme-signal-death-message nil
  "If non-nil, causes a message to be generated when the Scheme process dies."
-  :type 'boolean
+  :type 'boolean)
-  :group 'xscheme)
 (defcustom xscheme-start-hook nil
  "If non-nil, a procedure to call when the Scheme process is started.
 When called, the current buffer will be the Scheme process-buffer."
  :type 'hook
-  :group 'xscheme
  :version "20.3")
 (defun xscheme-evaluation-commands (keymap)
author	Stefan Kangas	2021-02-13 05:18:55 +0100
committer	Stefan Kangas	2021-02-13 07:17:20 +0100
commit	b4b9ecdfe366c64a7b95c4fd295b583c3f3c7aa9 (patch)
tree	65360c882a1620a73585172bfbc6941a1f80bb72
parent	ca0842347e5437bcaeeded4a7fd55e0e48ed4bad (diff)
download	emacs-b4b9ecdfe366c64a7b95c4fd295b583c3f3c7aa9.tar.gz emacs-b4b9ecdfe366c64a7b95c4fd295b583c3f3c7aa9.zip