From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 24 Jul 2024 21:48:05 +0000 (+0200)
Subject: Delete defgroup "wp" obsolete since Emacs 26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66fb5fdd7373327202de4c51f987d69ae3fa402c;p=emacs.git

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 688ac56c81a..38574853001 100644
--- 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.
+
 
 * Changes in Emacs 31.1 on Non-Free Operating Systems
 
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 465cf375d75..c10c1d435cb 100644
--- 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 3ef5d79a1a8..c33369a74ca 100644
--- 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).")