From 67d14c8222c05ac20229f71a2cf40eb9e3efa053 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 8 Oct 2016 16:37:42 +0300
Subject: [PATCH] Deprecate 'wp' group and introduce a new group 'text'

* lisp/textmodes/tildify.el (tildify):
* lisp/textmodes/text-mode.el (text-mode-hook):
* lisp/textmodes/table.el (table):
* lisp/textmodes/rst.el (rst):
* lisp/textmodes/refer.el (refer):
* lisp/textmodes/refbib.el (refbib):
* lisp/textmodes/picture.el (picture):
* lisp/textmodes/nroff-mode.el (nroff):
* lisp/textmodes/enriched.el (enriched):
* lisp/textmodes/bib-mode.el (bib):
* lisp/progmodes/ebnf2ps.el (ebnf2ps):
* lisp/nxml/rng-valid.el (relax-ng):
* lisp/view.el (view):
* lisp/ps-print.el (ps-print):
* lisp/printing.el (printing):
* lisp/outline.el (outlines):
* lisp/lpr.el (lpr):
* lisp/delim-col.el (columns): Use 'text' group instead of 'wp'.
* lisp/cus-edit.el (wp): Remove the "text" tag.
(text): New defgroup, inherits from the deprecated 'wp'.
(outlines): Remove, in favor of the definition in outline.el.
(tex): Inherit from 'text'.
Suggested by Drew Adams <drew.adams@oracle.com>.  (Bug#24549)
---
 etc/NEWS                     |  4 ++++
 lisp/cus-edit.el             | 16 +++++++++-------
 lisp/delim-col.el            |  2 +-
 lisp/lpr.el                  |  2 +-
 lisp/nxml/rng-valid.el       |  2 +-
 lisp/outline.el              |  2 +-
 lisp/printing.el             |  2 +-
 lisp/progmodes/ebnf2ps.el    |  2 +-
 lisp/ps-print.el             |  2 +-
 lisp/textmodes/bib-mode.el   |  2 +-
 lisp/textmodes/enriched.el   |  2 +-
 lisp/textmodes/nroff-mode.el |  2 +-
 lisp/textmodes/picture.el    |  2 +-
 lisp/textmodes/refbib.el     |  2 +-
 lisp/textmodes/refer.el      |  2 +-
 lisp/textmodes/rst.el        |  2 +-
 lisp/textmodes/table.el      |  2 +-
 lisp/textmodes/text-mode.el  |  2 +-
 lisp/textmodes/tildify.el    |  2 +-
 lisp/view.el                 |  2 +-
 20 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 4268a4009dc..59fb72a2bec 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -61,6 +61,10 @@ affected by this, as SGI stopped supporting IRIX in December 2013.
 
 * Changes in Emacs 26.1
 
+---
+The group 'wp', whose label was "text", is now deprecated.
+Use the new group 'text', which inherits from 'wp', instead.
+
 +++
 ** The new function 'call-shell-region' executes a command in an
 inferior shell with the buffer region as input.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 2e39514cac6..601445ab7f4 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -175,10 +175,16 @@
   :group 'emacs)
 
 (defgroup wp nil
-  "Support for editing text files."
-  :tag "Text"
+  "Support for editing text files.
+Use group `text' for this instead.  This group is deprecated."
   :group 'emacs)
 
+(defgroup text nil
+  "Support for editing text files."
+  :group 'emacs
+  ;; Inherit from deprecated `wp' for compatibility, for now.
+  :group 'wp)
+
 (defgroup data nil
   "Support for editing binary data files."
   :group 'emacs)
@@ -197,10 +203,6 @@
   :link '(custom-manual "(emacs)Emulation")
   :group 'editing)
 
-(defgroup outlines nil
-  "Support for hierarchical outlining."
-  :group 'wp)
-
 (defgroup external nil
   "Interfacing to external utilities."
   :group 'emacs)
@@ -313,7 +315,7 @@
 (defgroup tex nil
   "Code related to the TeX formatter."
   :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
-  :group 'wp)
+  :group 'text)
 
 (defgroup faces nil
   "Support for multiple fonts."
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index cfa7c76622a..dc637d5a57d 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -125,7 +125,7 @@
   "Prettify columns."
   :link '(emacs-library-link :tag "Source Lisp File" "delim-col.el")
   :prefix "delimit-columns-"
-  :group 'wp)
+  :group 'text)
 
 (defcustom delimit-columns-str-before ""
   "Specify a string to be inserted before all columns."
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 2fe32c7d5e7..d09f7791a93 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -42,7 +42,7 @@
 
 (defgroup lpr nil
   "Print Emacs buffer on line printer."
-  :group 'wp)
+  :group 'text)
 
 
 ;;;###autoload
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 946bf791ff8..239b1d11db1 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -101,7 +101,7 @@
 
 (defgroup relax-ng nil
   "Validation of XML using RELAX NG."
-  :group 'wp
+  :group 'text
   :group 'nxml
   :group 'languages)
 
diff --git a/lisp/outline.el b/lisp/outline.el
index f6ab1e49530..6345bb59df4 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -38,7 +38,7 @@
 (defgroup outlines nil
   "Support for hierarchical outlining."
   :prefix "outline-"
-  :group 'wp)
+  :group 'text)
 
 (defvar outline-regexp "[*\^L]+"
   "Regular expression to match the beginning of a heading.
diff --git a/lisp/printing.el b/lisp/printing.el
index d9cc2a3614a..7cdfb49a90f 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1668,7 +1668,7 @@ separator; otherwise, ensure unix-style directory separator."
   :link '(emacs-library-link :tag "Source Lisp File" "printing.el")
   :prefix "pr-"
   :version "22.1"
-  :group 'wp
+  :group 'text
   :group 'postscript)
 
 
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index ffb93de8062..c4e62683a6a 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1191,7 +1191,7 @@ Elements of ALIST that are not conses are ignored."
   "Translate an EBNF to a syntactic chart on PostScript."
   :prefix "ebnf-"
   :version "20"
-  :group 'wp
+  :group 'text
   :group 'postscript)
 
 
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 6c2a8c6161a..71523a90db6 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1495,7 +1495,7 @@ Please send all bug fixes and enhancements to
   :link '(emacs-library-link :tag "Source Lisp File" "ps-print.el")
   :prefix "ps-"
   :version "20"
-  :group 'wp
+  :group 'text
   :group 'postscript)
 
 (defgroup ps-print-horizontal nil
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 62b666b2524..8b40558e3a4 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -35,7 +35,7 @@
   "Major mode for editing bib files."
   :prefix "bib-"
   :group 'external
-  :group 'wp)
+  :group 'text)
 
 (defcustom bib-file "~/my-bibliography.bib"
   "Default name of file used by `addbib'."
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 124be27f4f3..5562a75340a 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -46,7 +46,7 @@
 
 (defgroup enriched nil
   "Read and save files in text/enriched format."
-  :group 'wp)
+  :group 'text)
 
 (defcustom enriched-verbose t
   "If non-nil, give status messages when reading and writing files."
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index b064f6d2b31..35996bc2509 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -37,7 +37,7 @@
 (defgroup nroff nil
   "Nroff mode."
   :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
-  :group 'wp
+  :group 'text
   :prefix "nroff-")
 
 
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index b77f8e9717c..01d67b5c1dd 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -33,7 +33,7 @@
 (defgroup picture nil
   "Editing text-based pictures (\"ASCII art\")."
   :prefix "picture-"
-  :group 'wp)
+  :group 'text)
 
 (defcustom picture-rectangle-ctl ?+
   "Character `picture-draw-rectangle' uses for top left corners."
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index b73916a22d6..46bf3c7552b 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -61,7 +61,7 @@
 (defgroup refbib nil
   "Convert refer-style references to ones usable by Latex bib."
   :prefix "r2b-"
-  :group 'wp)
+  :group 'text)
 
 (defcustom r2b-trace-on nil
   "Non-nil means trace conversion."
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index f2abf06ebdc..4c9e62bb4c8 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -73,7 +73,7 @@
 (defgroup refer nil
   "Look up references in bibliography files."
   :prefix "refer-"
-  :group 'wp)
+  :group 'text)
 
 (defcustom refer-bib-directory nil
   "Directory, or list of directories, to search for \\.bib files.
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 029139e572e..ddf8d3ce694 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -292,7 +292,7 @@ in parentheses follows the development revision and the time stamp.")
 ;; Initialize customization
 
 (defgroup rst nil "Support for reStructuredText documents."
-  :group 'wp
+  :group 'text
   :version "23.1"
   :link '(url-link "http://docutils.sourceforge.net/rst.html"))
 
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 8330e1772d7..e12a34095bb 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -641,7 +641,7 @@
   "Text based table manipulation utilities."
   :tag "Table"
   :prefix "table-"
-  :group 'wp
+  :group 'text
   :version "22.1")
 
 (defgroup table-hooks nil
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 731c2d2d85d..c42eec0c656 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -35,7 +35,7 @@
   "Normal hook run when entering Text mode and many related modes."
   :type 'hook
   :options '(turn-on-auto-fill turn-on-flyspell)
-  :group 'wp)
+  :group 'text)
 
 (defvar text-mode-variant nil
   "Non-nil if this buffer's major mode is a variant of Text mode.
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 598060e9ec8..cd258b8c970 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -54,7 +54,7 @@
 (defgroup tildify nil
   "Add hard spaces or other text fragments to text buffers."
   :version "21.1"
-  :group 'wp)
+  :group 'text)
 
 (defcustom tildify-pattern
   "\\(?:[,:;(][ \t]*[a]\\|\\<[AIKOSUVZikosuvz]\\)\\([ \t]+\\|[ \t]*\n[ \t]*\\)\\(?:\\w\\|[([{\\]\\|<[a-zA-Z]\\)"
diff --git a/lisp/view.el b/lisp/view.el
index ff7d2c9deb1..92cbd146d77 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -48,7 +48,7 @@
   "Peruse file or buffer without editing."
   :link '(function-link view-mode)
   :link '(custom-manual "(emacs)Misc File Ops")
-  :group 'wp)
+  :group 'text)
 
 (defcustom view-highlight-face 'highlight
    "The face used for highlighting the match found by View mode search."
-- 
git format-patch -1 --stdout -C 67d14c8222c05ac20229f71a2cf40eb9e3efa053