From 800a272b62598637904457bb156138c3b4e45b0b Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 27 Apr 2026 21:35:44 +0200
Subject: [PATCH] Fix defining a few faces as empty

e72afa9dbf92f45 replaced nil, which is invalid as a face definition,
with ((t (:inherit default))), but that does not actually result in
an "empty" face, which doesn't set any attributes.  Instead it doubles
down on all attributes set for the default face.  Replace that with
((t)), which accomplishes what appears to have been the intention.

* lisp/net/shr.el (shr-h4, shr-h5, shr-h6):
* lisp/nxml/nxml-mode.el (nxml-text):
* lisp/progmodes/make-mode.el (makefile-shell): Use empty face
definition ((t)), instead of ((t (:inherit default))).
---
 lisp/net/shr.el             | 6 +++---
 lisp/nxml/nxml-mode.el      | 2 +-
 lisp/progmodes/make-mode.el | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 0488564f653..7e47d93d81c 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -292,17 +292,17 @@ temporarily blinks with this face."
   :version "28.1")
 
 (defface shr-h4
-  '((t (:inherit default)))
+  '((t))
   "Face for <h4> elements."
   :version "28.1")
 
 (defface shr-h5
-  '((t (:inherit default)))
+  '((t))
   "Face for <h5> elements."
   :version "28.1")
 
 (defface shr-h6
-  '((t (:inherit default)))
+  '((t))
   "Face for <h6> elements."
   :version "28.1")
 
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 64e6219e115..9b617b40f09 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -152,7 +152,7 @@ This is not used directly, but only via inheritance by other faces."
   :group 'nxml-faces)
 
 (defface nxml-text
-  '((t (:inherit default)))
+  '((t))
   "Face used to highlight text."
   :group 'nxml-faces)
 
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index e34eaba3150..a93b6bfc7a9 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -93,7 +93,7 @@
   :version "22.1")
 
 (defface makefile-shell
-  '((t (:inherit default)))
+  '((t))
   ;;'((((class color) (min-colors 88) (background light)) (:background  "seashell1"))
   ;;  (((class color) (min-colors 88) (background dark)) (:background  "seashell4")))
   "Face to use for additionally highlighting Shell commands in Font-Lock mode."