Delete defgroup "wp" obsolete since Emacs 26

* lisp/cus-edit.el (wp): Delete defgroup obsolete since Emacs 26.
(text): Don't inherit obsolete customization group 'wp'.
* lisp/finder.el (finder-known-keywords): Delete 'wp' keyword.

(cherry picked from commit 0ae70433eabe9cf672a7f0f0803f72ad136b1344)

diff --git a/etc/NEWS b/etc/NEWS
index 688ac56c81a37774121cbd838d73aff290241515..385748530013906a71791a454475d4a717465829 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -161,6 +161,9 @@ A new ':authorizable t' parameter has been added to 'dbus-call-method'
 and 'dbus-call-method-asynchronously' to allow the user to interactively
 authorize the invoked D-Bus method (e.g., via polkit).
 
+** The customization group 'wp' has been removed.
+It has been obsolete since Emacs 26.1.  Use the group 'text' instead.
+
 \f
 * Changes in Emacs 31.1 on Non-Free Operating Systems
 

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 465cf375d7587953508c9d4e60a165912f19ce71..c10c1d435cb94f90cfae39518e86b16b0f19c638 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -175,16 +175,9 @@
   "Support for editing files."
   :group 'emacs)
 
-(defgroup wp nil
-  "Support for editing text files.
-Use group `text' for this instead.  This group is obsolete."
-  :group 'emacs)
-
 (defgroup text nil
   "Support for editing text files."
-  :group 'emacs
-  ;; Inherit from deprecated `wp' for compatibility, for now.
-  :group 'wp)
+  :group 'emacs)
 
 (defgroup data nil
   "Support for editing binary data files."

diff --git a/lisp/finder.el b/lisp/finder.el
index 3ef5d79a1a8e57ec42e1888d3f72e4167c39ee57..c33369a74ca66c91266d3d4b74a2cda83a990a28 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -71,8 +71,7 @@
     (text      . "editing text files")
     (tools     . "programming tools")
     (unix      . "UNIX feature interfaces and emulators")
-    (vc                . "version control")
-    (wp                . "use keyword `text' instead; this keyword is obsolete"))
+    (vc                . "version control"))
   "Association list of the standard \"Keywords:\" headers.
 Each element has the form (KEYWORD . DESCRIPTION).")