[elpa] scratch/auctex-lexbind 78c09ee 04/11: Remove some redundant `:group` arguments

[Stefan Monnier]

branch: scratch/auctex-lexbind
commit 78c09ee4590a14bc25424fa8e2b609c74cb499c5
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Remove some redundant `:group` arguments
---
 bib-cite.el  | 15 ---------------
 tex-fold.el  | 41 +++++++++++++----------------------------
 tex-jp.el    |  7 -------
 tex-site.el  |  1 -
 tex-style.el | 42 +++++++++---------------------------------
 texmathp.el  |  5 +----
 6 files changed, 23 insertions(+), 88 deletions(-)

diff --git a/bib-cite.el b/bib-cite.el
index e97c15e..693677f 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -610,32 +610,27 @@
 When this variable is non-nil, both `bib-find' and `bib-display' will
 call a function in RefTeX to find or display the cross reference of a
 \\ref or \\cite macro at point."
-  :group 'bib-cite
   :type 'boolean)
 
 (defcustom bib-novice t
   "Give advice to novice users about what commands to use next."
-  :group 'bib-cite
   :type 'boolean)
 
 (defcustom bib-switch-to-buffer-function 'switch-to-buffer
   "Function used to select buffers if they differ from the original.
 You may use `switch-to-buffer' `switch-to-buffer-other-window' or
 `switch-to-buffer-other-frame'."
-  :group 'bib-cite
   :type '(choice (function-item switch-to-buffer)
                  (function-item switch-to-buffer-other-window)
                  (function-item switch-to-buffer-other-frame)))
 
 (defcustom bib-highlight-mouse-t t
   "Call bib-highlight-mouse from `LaTeX-mode-hook' to add green highlight."
-  :group 'bib-cite
   :type 'boolean)
 
 (defcustom bib-label-help-echo-format "button2 finds %s, button3 displays %s"
   "Format string for info if the mouse is over LaTeX commands.
 If nil, do not display info."
-  :group 'bib-cite
   :type '(radio (const :tag "Don't display info" nil)
                 string))
 
@@ -646,21 +641,18 @@ Another version says it should BSTINPUTS.  I don't know 
anymore!
 
 The colon character (:) is the default path separator in unix, but you may
 use semi-colon (;) for DOS or OS/2 if you set bib-dos-or-os2-variable to t."
-  :group 'bib-cite
   :type 'string)
 
 (defcustom bib-cite-inputs nil
   "List of directories to search for .bib files.
 This is in addition to those listed in the environment variable specified by
 `bib-bibtex-env-variable'."
-  :group 'bib-cite
   :type '(repeat (file :format "%v")))
 
 (defcustom bib-cite-aux-inputs nil
   "List of directories to search for .aux files.
 MiKTeX has the LaTeX option -aux-directory to store .aux files in an alternate
 directory.  You may set this variable to let bib-cite find these .aux files."
-  :group 'bib-cite
   :type '(repeat (file :format "%v")))
 
 (defcustom bib-dos-or-os2-variable (or (equal 'emx system-type)
@@ -677,7 +669,6 @@ e.g. Use a path like 
\"c:\\emtex\\bibinput;c:\\latex\\bibinput\"
 
 \(You can change the environment variable which is searched by
 setting the elisp variable bib-bibtex-env-variable)"
-  :group 'bib-cite
   :type 'boolean)
 
 (defcustom bib-etags-command "etags -r '/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/' 
-o "
@@ -686,21 +677,18 @@ In unix, this is usually \"etags -r 
'/.*\\\(eq\|page\|[fvF]\)ref.*/' -o \"
 \(we use the -r option to tell etags to list AMS-LaTeX's \\eqref command.)
 In DOS and OS/2, this *may* be different, e.g. using slashes like \"etags /o=\"
 If so, set it this variable."
-  :group 'bib-cite
   :type 'string)
 
 (defcustom bib-etags-append-command "etags -r 
'/.*\\\\\\(eq\\|page\\|[fvF]\\)ref.*/' -a -o "
   "Variable for the etags command and its append and output option.
 In unix, this is usually \"etags -r '/.*\\\(eq\|page\|[fvF]\)ref.*/' -a -o \"
 In DOS and OS/2, this *may* be \"etags /a /o=\"  If so, set it this variable."
-  :group 'bib-cite
   :type 'string)
 
 (defcustom bib-etags-filename "TAGS"
    "Variable for the filename generated by etags, by defaults this TAGS.
 but you may want to change this to something like TAGSLaTeX such that it can
 coexist with some other tags file in your master file directory."
-  :group 'bib-cite
   :type 'string)
 
 (defcustom bib-ref-regexp "\\\\\\(eq\\|page\\|[fvF]\\)?ref"
@@ -709,14 +697,12 @@ without the curly bracket.
 
 If you change this variable and you use multi-file documents, make sure you
 also edit the variables bib-etags-command and bib-etags-append-command."
-  :group 'bib-cite
   :type 'regexp)
 
 (defcustom bib-substitute-string-in-display t
   "Determines if bib-display will substitute @string definitions.
 If t, then the @string text is substituted.
 If nil, the text is not substituted but the @string entry is included."
-  :group 'bib-cite
   :type 'boolean)
 
 (defcustom bib-string-ignored-warning
@@ -726,7 +712,6 @@ If nil, the text is not substituted but the @string entry 
is included."
     "toms" "toois" "toplas" )
   "@string abbreviations for which a warning is not given if not defined.
 These are usually month abbreviations (or journals) defined in a style file."
-  :group 'bib-cite
   :type '(repeat (string :tag "Entry")))
 
 ;;<<<<<<User-Modifiable variables end here.
diff --git a/tex-fold.el b/tex-fold.el
index c91e523..9fa310d 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -67,8 +67,7 @@ macros, 'math for math macros and 'comment for comments."
   :type '(set (const :tag "Environments" env)
               (const :tag "Macros" macro)
               (const :tag "Math Macros" math)
-              (const :tag "Comments" comment))
-  :group 'TeX-fold)
+              (const :tag "Comments" comment)))
 
 (defcustom TeX-fold-macro-spec-list
   `(("[f]" ("footnote" "marginpar"))
@@ -118,8 +117,7 @@ Customize or reset the mode."
   :type '(repeat (group (choice (string :tag "Display String")
                                 (integer :tag "Number of argument" :value 1)
                                 (function :tag "Function to execute"))
-                        (repeat :tag "Macros" (string))))
-  :group 'TeX-fold)
+                        (repeat :tag "Macros" (string)))))
 
 (defvar TeX-fold-macro-spec-list-internal nil
   "Internal list of display strings and macros to fold.
@@ -134,8 +132,7 @@ and <mode-prefix>-fold-macro-spec-list.")
   "List of display strings and environments to fold."
   :type '(repeat (group (choice (string :tag "Display String")
                                 (integer :tag "Number of argument" :value 1))
-                        (repeat :tag "Environments" (string))))
-  :group 'TeX-fold)
+                        (repeat :tag "Environments" (string)))))
 
 (defvar TeX-fold-env-spec-list-internal nil
   "Internal list of display strings and environments to fold.
@@ -149,8 +146,7 @@ and <mode-prefix>-fold-env-spec-list.")
   "List of display strings and math macros to fold."
   :type '(repeat (group (choice (string :tag "Display String")
                                 (integer :tag "Number of argument" :value 1))
-                        (repeat :tag "Math Macros" (string))))
-  :group 'TeX-fold)
+                        (repeat :tag "Math Macros" (string)))))
 
 (defvar TeX-fold-math-spec-list-internal nil
   "Internal list of display strings and math macros to fold.
@@ -164,15 +160,13 @@ and <mode-prefix>-fold-math-spec-list.")
   "Display string for unspecified macros.
 This string will be displayed if a single macro is being hidden
 which is not specified in `TeX-fold-macro-spec-list'."
-  :type '(string)
-  :group 'TeX-fold)
+  :type '(string))
 
 (defcustom TeX-fold-unspec-env-display-string "[env]"
   "Display string for unspecified environments.
 This string will be displayed if a single environment is being
 hidden which is not specified in `TeX-fold-env-spec-list'."
-  :type '(string)
-  :group 'TeX-fold)
+  :type '(string))
 
 (defcustom TeX-fold-unspec-use-name t
   "If non-nil use the name of an unspecified item as display string.
@@ -180,33 +174,27 @@ Set it to nil if you want to use the values of the 
variables
 `TeX-fold-unspec-macro-display-string' or
 `TeX-fold-unspec-env-display-string' respectively as a display
 string for any unspecified macro or environment."
-  :type 'boolean
-  :group 'TeX-fold)
+  :type 'boolean)
 
 (defcustom TeX-fold-preserve-comments nil
   "If non-nil do not fold in comments."
-  :type 'boolean
-  :group 'TeX-fold)
+  :type 'boolean)
 
 (defcustom TeX-fold-unfold-around-mark t
   "Unfold text around the mark, if active."
-  :type 'boolean
-  :group 'TeX-fold)
+  :type 'boolean)
 
 (defcustom TeX-fold-help-echo-max-length 70
   "Maximum length of help echo message for folded overlays.
 Set it to zero in order to disable help echos."
-  :type 'integer
-  :group 'TeX-fold)
+  :type 'integer)
 
 (defcustom TeX-fold-force-fontify t
   "Force the buffer to be fully fontified by folding it."
-  :group 'TeX-fold
   :type 'boolean)
 
 (defcustom TeX-fold-auto nil
   "If non-nil, fold macros automatically after `TeX-insert-macro'."
-  :group 'TeX-fold
   :type 'boolean)
 
 (defface TeX-fold-folded-face
@@ -219,8 +207,7 @@ Set it to zero in order to disable help echos."
     (((class grayscale) (background dark))
      (:foreground "LightGray"))
     (t (:slant italic)))
-  "Face for the display string of folded content."
-  :group 'TeX-fold)
+  "Face for the display string of folded content.")
 
 (defvar TeX-fold-folded-face 'TeX-fold-folded-face
   "Face for the display string of folded content.")
@@ -235,8 +222,7 @@ Set it to zero in order to disable help echos."
     (((class grayscale) (background dark))
      (:background "DimGray"))
     (t (:inverse-video t)))
-  "Face for folded content when it is temporarily opened."
-  :group 'TeX-fold)
+  "Face for folded content when it is temporarily opened.")
 
 (defvar TeX-fold-unfolded-face 'TeX-fold-unfolded-face
   "Face for folded content when it is temporarily opened.")
@@ -251,8 +237,7 @@ Set it to zero in order to disable help echos."
   "Prefix key to use for commands in TeX Fold mode.
 The value of this variable is checked as part of loading TeX Fold mode.
 After that, changing the prefix key requires manipulating keymaps."
-  :type 'string
-  :group 'TeX-fold)
+  :type 'string)
 
 (defvar TeX-fold-keymap
   (let ((map (make-sparse-keymap)))
diff --git a/tex-jp.el b/tex-jp.el
index 3d47a61..d6308c5 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -46,7 +46,6 @@
 
 (defcustom japanese-TeX-engine-default 'ptex
   "Default TeX engine for Japanese TeX."
-  :group 'AUCTeX-jp
   :type '(choice (const :tag "pTeX" ptex)
                  (const :tag "jTeX" jtex)
                  (const :tag "upTeX" uptex)))
@@ -56,7 +55,6 @@
 If `TeX-japanese-process-input-coding-system' or
 `TeX-japanese-process-output-coding-system' are non-nil, the process coding
 systems are determined by their values regardless of the kanji option."
-  :group 'AUCTeX-jp
   :type 'boolean)
 
 (setq TeX-engine-alist-builtin
@@ -227,26 +225,22 @@ systems are determined by their values regardless of the 
kanji option."
 
 (defcustom japanese-TeX-error-messages t
   "If non-nil, explain TeX error messages in Japanese."
-  :group 'AUCTeX-jp
   :type 'boolean)
 
 (defcustom TeX-japanese-process-input-coding-system nil
   "If non-nil, used for encoding input to Japanese TeX process.
 When nil, AUCTeX tries to choose suitable coding system.
 See also a user custom option `TeX-japanese-process-output-coding-system'."
-  :group 'AUCTeX-jp
   :type '(choice (const :tag "Default" nil) coding-system))
 
 (defcustom TeX-japanese-process-output-coding-system nil
   "If non-nil, used for decoding output from Japanese TeX process.
 When nil, AUCTeX tries to choose suitable coding system.
 See also a user custom option `TeX-japanese-process-input-coding-system'."
-  :group 'AUCTeX-jp
   :type '(choice (const :tag "Default" nil) coding-system))
 
 (defcustom japanese-LaTeX-default-style "jarticle"
   "Default when creating new Japanese documents."
-  :group 'AUCTeX-jp
   :type 'string)
 
 (defcustom japanese-LaTeX-style-list
@@ -266,7 +260,6 @@ See also a user custom option 
`TeX-japanese-process-input-coding-system'."
     ("ujarticle") ("ujreport") ("ujbook")
     ("utarticle") ("utreport") ("utbook"))
   "List of Japanese document classes."
-  :group 'AUCTeX-jp
   :type '(repeat (group (string :format "%v"))))
 
 (setq LaTeX-style-list
diff --git a/tex-site.el b/tex-site.el
index d580c11..3a82d15 100644
--- a/tex-site.el
+++ b/tex-site.el
@@ -148,7 +148,6 @@ set it with `TeX-modes-set'."
   :type (cons 'set
               (mapcar (lambda(x) (list 'const (car x))) TeX-mode-alist))
   :set #'TeX-modes-set
-  :group 'AUCTeX
   :initialize(lambda (var value)
                (custom-initialize-reset var value)
                (unless (fboundp 'advice-add)
diff --git a/tex-style.el b/tex-style.el
index 85e891a..13811e4 100644
--- a/tex-style.el
+++ b/tex-style.el
@@ -37,13 +37,11 @@
 
 (defcustom LaTeX-reftex-ref-style-auto-activate t
   "Whether to activate automatically RefTeX reference styles."
-  :type 'boolean
-  :group 'LaTeX-style)
+  :type 'boolean)
 
 (defcustom LaTeX-reftex-cite-format-auto-activate t
   "Whether to activate automatically RefTeX citation format."
-  :type 'boolean
-  :group 'LaTeX-style)
+  :type 'boolean)
 
 ;; style/amsmath.el
 
@@ -61,19 +59,16 @@ Amsmath equations include \"align\", \"alignat\", 
\"xalignat\",
 
 (defcustom LaTeX-beamer-section-labels-flag nil
   "If non-nil section labels are added"
-  :type 'boolean
-  :group 'LaTeX-style)
+  :type 'boolean)
 
 (defcustom LaTeX-beamer-item-overlay-flag t
   "If non-nil do prompt for an overlay in itemize-like environments."
-  :type 'boolean
-  :group 'LaTeX-style)
+  :type 'boolean)
 
 (defcustom LaTeX-beamer-themes 'local
   "Presentation themes for the LaTeX beamer package.
 It can be a list of themes or a function.  If it is the symbol
 `local', search only once per buffer."
-  :group 'LaTeX-style
   :type
   '(choice
     (const :tag "TeX search" LaTeX-beamer-search-themes)
@@ -121,7 +116,6 @@ It can be a list of themes or a function.  If it is the 
symbol
   "Presentation inner themes for the LaTeX beamer package.
 It can be a list of themes or a function.  If it is the symbol
 `local', search only once per buffer."
-  :group 'LaTeX-style
   :type '(choice
     (const :tag "TeX search" LaTeX-beamer-search-inner-themes)
     (const :tag "Search once per buffer" local)
@@ -142,7 +136,6 @@ It can be a list of themes or a function.  If it is the 
symbol
   "Presentation outer themes for the LaTeX beamer package.
 It can be a list of themes or a function.  If it is the symbol
 `local', search only once per buffer."
-  :group 'LaTeX-style
   :type
   '(choice
     (const :tag "TeX search" LaTeX-beamer-search-outer-themes)
@@ -170,7 +163,6 @@ It can be a list of themes or a function.  If it is the 
symbol
   "Presentation color themes for the LaTeX beamer package.
 It can be a list of themes or a function.  If it is the symbol
 `local', search only once per buffer."
-  :group 'LaTeX-style
   :type
   '(choice
     (const :tag "TeX search" LaTeX-beamer-search-color-themes)
@@ -204,7 +196,6 @@ It can be a list of themes or a function.  If it is the 
symbol
   "Presentation font themes for the LaTeX beamer package.
 It can be a list of themes or a function.  If it is the symbol
 `local', search only once per buffer."
-  :group 'LaTeX-style
   :type
   '(choice
     (const :tag "TeX search" LaTeX-beamer-search-font-themes)
@@ -241,31 +232,27 @@ override the autodetection of the biblatex backend.")
   "List of environment names defined with comment.sty.
 Setting this variable does not take effect unless you
 reinitialize affected buffers."
-  :type '(repeat string)
-  :group 'LaTeX-style)
+  :type '(repeat string))
 
 ;; style/csquotes.el
 
 (defcustom LaTeX-csquotes-quote-after-quote nil
   "Initial value of `TeX-quote-after-quote' for `csquotes.el'"
-  :type 'boolean
-  :group 'LaTeX-style)
+  :type 'boolean)
 
 (defcustom LaTeX-csquotes-open-quote ""
   "Opening quotation mark to be used with the csquotes package.
 The specified string will be used for `TeX-open-quote' (and override
 any language-specific setting) only if both `LaTeX-csquotes-open-quote'
 and `LaTeX-csquotes-close-quote' are non-empty strings."
-  :type 'string
-  :group 'LaTeX-style)
+  :type 'string)
 
 (defcustom LaTeX-csquotes-close-quote ""
   "Closing quotation mark to be used with the csquotes package.
 The specified string will be used for `TeX-close-quote' (and override
 any language-specific setting) only if both `LaTeX-csquotes-open-quote'
 and `LaTeX-csquotes-close-quote' are non-empty strings."
-  :type 'string
-  :group 'LaTeX-style)
+  :type 'string)
 
 ;; style/emp.el
 
@@ -273,8 +260,7 @@ and `LaTeX-csquotes-close-quote' are non-empty strings."
   "If non-nil, insert automatically the \\write18 calling metapost.
 When disabled, you have to use mpost on the mp files automatically
 produced by emp.sty and then re-LaTeX the document."
-  :type 'boolean
-  :group 'LaTeX-style)
+  :type 'boolean)
 
 ;; style/exam.el
 
@@ -284,12 +270,10 @@ produced by emp.sty and then re-LaTeX the document."
 A character argument for quick identification when RefTeX inserts
 new references with `reftex-reference'.  It must be unique.  It
 is initialized to ?x."
-  :group 'LaTeX-style
   :type 'character)
 
 (defcustom LaTeX-exam-label "exm:"
   "Default prefix to labels in environments of exam class."
-  :group 'LaTeX-style
   :type 'string)
 
 ;; style/fontspec.el
@@ -305,7 +289,6 @@ time `LaTeX-fontspec-arg-font' is called.
 `LaTeX-fontspec-arg-font' calls `luaotf-load --list=basename' to
 automatically get the list of fonts.  This requires
 `luaotfload-tool' version 2.3 or higher in order to work."
-  :group 'LaTeX-style
   :type '(choice
           (const :tag "Search automatically" t)
           (const :tag "Use default font list" nil)
@@ -314,7 +297,6 @@ automatically get the list of fonts.  This requires
 (defcustom LaTeX-fontspec-font-list-default nil
   "List of default fonts to be used as completion for
 `LaTeX-fontspec-arg-font'."
-  :group 'LaTeX-style
   :type '(repeat (string :tag "Font")))
 
 ;; style/graphicx.el
@@ -322,7 +304,6 @@ automatically get the list of fonts.  This requires
 (defcustom LaTeX-includegraphics-extensions
   '("eps" "jpe?g" "pdf" "png")
   "Extensions for images files used by \\includegraphics."
-  :group 'LaTeX-style
   :type '(list (set :inline t
                     (const "eps")
                     (const "jpe?g")
@@ -334,7 +315,6 @@ automatically get the list of fonts.  This requires
 
 (defcustom LaTeX-includegraphics-strip-extension-flag t
   "Non-nil means to strip known extensions from image file name."
-  :group 'LaTeX-style
   :type 'boolean)
 
 (defcustom LaTeX-includegraphics-read-file
@@ -365,7 +345,6 @@ Inserting the subdirectory in the filename (as
   ;; `----
   ;; See "Inefficiency" and "Unportability" in the same section for more
   ;; information.
-  :group 'LaTeX-style
   :type '(choice (const :tag "TeX" LaTeX-includegraphics-read-file-TeX)
                  (const :tag "relative"
                         LaTeX-includegraphics-read-file-relative)
@@ -388,7 +367,6 @@ Inserting the subdirectory in the filename (as
 A character argument for quick identification when RefTeX inserts
 new references with `reftex-reference'.  It must be unique.  It
 is initialized to ?v."
-  :group 'LaTeX-style
   :type 'character)
 
 ;; style/shortvrb.el
@@ -412,7 +390,6 @@ becomes the default value meaning that verbatim 
fontification is
 always performed for the characters in the list, no matter if
 your document actually defines shortvrb chars using
 \\MakeShortVrb."
-  :group 'LaTeX-style
   :type '(repeat character))
 (put 'LaTeX-shortvrb-chars 'safe-local-variable #'listp)
 
@@ -425,7 +402,6 @@ A character argument for quick identification of 
\"\\sindex\"
 when RefTeX inserts new index entries with `reftex-index'.  It
 must be unique.  It is initialized to ?s when added to
 `reftex-index-macros'."
-  :group 'LaTeX-style
   :type 'character)
 
 ;; Don't look for file-local variables before this line, so that the
diff --git a/texmathp.el b/texmathp.el
index 814dd4b..cd9336b 100644
--- a/texmathp.el
+++ b/texmathp.el
@@ -1,6 +1,6 @@
 ;;; texmathp.el -- Code to check if point is inside LaTeX math environment  
-*- lexical-binding: t; -*-
 
-;; Copyright (C) 1998, 2004, 2017, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2021  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.LeidenUniv.nl>
 ;; Maintainer: auctex-devel@gnu.org
@@ -212,7 +212,6 @@ The structure of each entry is (NAME TYPE)
     `sw-on'      Switch: turns math-mode of following text  on
     `sw-off'     Switch: turns math-mode of following text  off
     `sw-toggle'  Switch: toggles math mode of following text"
-  :group 'texmathp
   :set '(lambda (symbol value) (set-default symbol value) (texmathp-compile))
   :type
   '(repeat
@@ -235,7 +234,6 @@ backward to the nearest empty line.
 However, during editing it happens that such lines exist temporarily.
 Therefore we look a little further.  This variable determines how many
 empty lines we go back to fix the search limit."
-  :group 'texmathp
   :type 'number)
 
 (defcustom texmathp-allow-detached-args nil
@@ -244,7 +242,6 @@ When this is t, `aaa' will be interpreted as an argument of 
\\bbb in the
 following construct:  \\bbb [xxx] {aaa}
 This is legal in TeX.  The disadvantage is that any number of braces 
expressions
 will be considered arguments of the macro independent of its definition."
-  :group 'texmathp
   :type 'boolean)
 
 (defvar texmathp-why nil