Merge: Fix face inheritance

alphapapa · Oct 12, 2024 · aa7bf66 · aa7bf66
2 parents 8c962cc + 4b92fcc
commit aa7bf66
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/README.org b/README.org
@@ -317,7 +317,8 @@ Ement.el doesn't support encrypted rooms natively, but it can be used transparen
 + Command ~ement-disconnect~ no longer shows an error message.  ([[https://github.com/alphapapa/ement.el/issues/208][#208]].)
 + Retrieval of earlier events in a just-joined room.  ([[https://github.com/alphapapa/ement.el/issues/148][#148]].  Thanks to [[https://github.com/MagicRB][Richard Brežák]] for reporting, and to [[https://github.com/phil-s][Phil Sainty]] for testing.)
 + Cache computed displaynames in rooms (avoiding unnecessary reiteration and recalculation).  ([[https://github.com/alphapapa/ement.el/issues/298][#298]].  Thanks to [[https://github.com/Rutherther][Rutherther]] for reporting and testing, and to [[https://github.com/phil-s][Phil Sainty]].)
-+ Customization group for options ~ement-room-mode-hook~ and ~ement-room-self-insert-mode~.  (Thanks to [[https://github.com/phil-s][Phil Sainty]].)  
++ Customization group for options ~ement-room-mode-hook~ and ~ement-room-self-insert-mode~.  (Thanks to [[https://github.com/phil-s][Phil Sainty]].)
++ Inheritance for some faces.  ([[https://github.com/alphapapa/ement.el/pull/303][#303]].  Thanks to [[https://github.com/tarsius][Jonas Bernoulli]].) 
 
 ** 0.15.1
 

diff --git a/ement-room-list.el b/ement-room-list.el
@@ -162,7 +162,7 @@ Set automatically when `ement-room-list-mode' is activated.")
   "Favourite rooms.")
 
 (defface ement-room-list-invited
-  '((t (:inherit italic ement-room-list-name)))
+  '((t (:inherit (italic ement-room-list-name))))
   "Invited rooms.")
 
 (defface ement-room-list-left
@@ -173,15 +173,15 @@ Set automatically when `ement-room-list-mode' is activated.")
   "Low-priority rooms.")
 
 (defface ement-room-list-name
-  '((t (:inherit font-lock-function-name-face button)))
+  '((t (:inherit (font-lock-function-name-face button))))
   "Non-direct rooms.")
 
 (defface ement-room-list-space '((t (:inherit (font-lock-regexp-grouping-backslash ement-room-list-name))))
   "Space rooms."
   :group 'ement-room-list)
 
 (defface ement-room-list-unread
-  '((t (:inherit bold ement-room-list-name)))
+  '((t (:inherit (bold ement-room-list-name))))
   "Unread rooms.")
 
 (defface ement-room-list-recent '((t (:inherit font-lock-warning-face)))

diff --git a/ement-tabulated-room-list.el b/ement-tabulated-room-list.el
@@ -89,7 +89,7 @@ For example, \"1h54m3s\" becomes \"1h\"."
 ;;;;; Faces
 
 (defface ement-tabulated-room-list-name
-  '((t (:inherit font-lock-function-name-face button)))
+  '((t (:inherit (font-lock-function-name-face button))))
   "Non-direct rooms.")
 
 (defface ement-tabulated-room-list-direct
@@ -99,15 +99,15 @@ For example, \"1h54m3s\" becomes \"1h\"."
   "Direct rooms.")
 
 (defface ement-tabulated-room-list-invited
-  '((t (:inherit italic ement-tabulated-room-list-name)))
+  '((t (:inherit (italic ement-tabulated-room-list-name))))
   "Invited rooms.")
 
 (defface ement-tabulated-room-list-left
   '((t (:strike-through t :inherit ement-tabulated-room-list-name)))
   "Left rooms.")
 
 (defface ement-tabulated-room-list-unread
-  '((t (:inherit bold ement-tabulated-room-list-name)))
+  '((t (:inherit (bold ement-tabulated-room-list-name))))
   "Unread rooms.")
 
 (defface ement-tabulated-room-list-favourite '((t (:inherit (font-lock-doc-face ement-tabulated-room-list-name))))