Modernise face specs and set version tags in eww/shr

* lisp/net/shr.el (shr-strike-through, shr-link, shr-selected-link):
Set :version tag (bug#31200).

* lisp/net/eww.el (eww-form-text, eww-form-textarea):
* lisp/net/shr.el (shr-strike-through, shr-link, shr-selected-link):
Use (DISPLAY . PLIST) face spec syntax as recommended in
'(elisp) Defining Faces'.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index f73718961208876c85d64fb040a25baad4e7b19d..e74f661ac75f2308d50942a89b276852ffe2e3b3 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -186,17 +186,17 @@ See also `eww-form-checkbox-selected-symbol'."
   :group 'eww)
 
 (defface eww-form-text
-  '((t (:background "#505050"
-                   :foreground "white"
-                   :box (:line-width 1))))
+  '((t :background "#505050"
+       :foreground "white"
+       :box (:line-width 1)))
   "Face for eww text inputs."
   :version "24.4"
   :group 'eww)
 
 (defface eww-form-textarea
-  '((t (:background "#C0C0C0"
-                   :foreground "black"
-                   :box (:line-width 1))))
+  '((t :background "#C0C0C0"
+       :foreground "black"
+       :box (:line-width 1)))
   "Face for eww textarea inputs."
   :version "24.4"
   :group 'eww)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 0fc7ccf95825b630f8a8e783eff9baee1c0bc709..ca70c5c656c60ee6c78554395a2402deea8fb9d6 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -135,17 +135,17 @@ cid: URL as the argument.")
 (defvar shr-put-image-function 'shr-put-image
   "Function called to put image and alt string.")
 
-(defface shr-strike-through '((t (:strike-through t)))
+(defface shr-strike-through '((t :strike-through t))
   "Font for <s> elements."
   :group 'shr)
 
 (defface shr-link
-  '((t (:inherit link)))
+  '((t :inherit link))
   "Font for link elements."
   :group 'shr)
 
 (defface shr-selected-link
-  '((t (:inherit shr-link :background "red")))
+  '((t :inherit shr-link :background "red"))
   "Font for link elements."
   :group 'shr)