From f825df6464975dcea2fbf6e2f3472fd628977a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Ribeiro=20Mendes=20J=C3=BAnior?= Date: Fri, 16 May 2025 19:58:32 -0300 Subject: [PATCH 1/3] apply mu4e's `mu4e-related-face` in :subject column for related mail Also, determine face for :thread-subject in terms of the determination for :subject, as they are the same since a recent commit. --- mu4e-column-faces.el | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/mu4e-column-faces.el b/mu4e-column-faces.el index db5b1eb..787e6e9 100644 --- a/mu4e-column-faces.el +++ b/mu4e-column-faces.el @@ -274,31 +274,24 @@ the message flags in included in `mu4e-column-faces--apply-face'." (inline-quote (cl-case ,column (:subject - (let ((flags (mu4e-message-field ,msg :flags))) + (let ((flags (mu4e-message-field ,msg :flags)) + (meta (mu4e-message-field ,msg :meta))) (cond ((memq 'trashed flags) 'mu4e-trashed-face) ((memq 'draft flags) 'mu4e-draft-face) ((or (memq 'unread flags) (memq 'new flags)) 'mu4e-unread-face) ((memq 'flagged flags) 'mu4e-flagged-face) + ((plist-get meta :related) 'mu4e-related-face) ((memq 'replied flags) 'mu4e-replied-face) ((memq 'passed flags) 'mu4e-forwarded-face) - (t 'mu4e-header-face)) )) + (t 'mu4e-header-face)))) ((:to :from :cc :bcc :from-or-to) 'mu4e-column-faces-to-from) (:attachments 'mu4e-column-faces-attachments) (:message-id 'mu4e-column-faces-message-id) (:thread-subject - (let ((flags (mu4e-message-field ,msg :flags))) - (cond - ((memq 'trashed flags) 'mu4e-trashed-face) - ((memq 'draft flags) 'mu4e-draft-face) - ((or (memq 'unread flags) (memq 'new flags)) - 'mu4e-unread-face) - ((memq 'flagged flags) 'mu4e-flagged-face) - ((memq 'replied flags) 'mu4e-replied-face) - ((memq 'passed flags) 'mu4e-forwarded-face) - (t 'mu4e-header-face)) )) + (mu4e-column-faces--determine-face :subject msg)) (:flags 'mu4e-column-faces-flags) (:tags 'mu4e-column-faces-tags) (:size 'mu4e-column-faces-size) From 573ab7d537866c0e51f8201eead31cee4a29c19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Ribeiro=20Mendes=20J=C3=BAnior?= Date: Fri, 16 May 2025 20:11:09 -0300 Subject: [PATCH 2/3] use `add-face-text-property` to preserve `mu4e-thread-fold-face` --- mu4e-column-faces.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mu4e-column-faces.el b/mu4e-column-faces.el index 787e6e9..59ee62c 100644 --- a/mu4e-column-faces.el +++ b/mu4e-column-faces.el @@ -264,7 +264,7 @@ the message flags in included in `mu4e-column-faces--apply-face'." face)) (val (if width (mu4e~headers-truncate-field field val width) val))) (when face - (put-text-property 0 (length val) 'face face val)) + (add-face-text-property 0 (length val) face t val)) val)))) (define-inline mu4e-column-faces--determine-face (column msg) From 2ea6c51eb65d1dacca0a14061d245191819e9db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Ribeiro=20Mendes=20J=C3=BAnior?= Date: Fri, 16 May 2025 20:13:41 -0300 Subject: [PATCH 3/3] remove double definition of no longer used face --- mu4e-column-faces.el | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mu4e-column-faces.el b/mu4e-column-faces.el index 59ee62c..4f065a1 100644 --- a/mu4e-column-faces.el +++ b/mu4e-column-faces.el @@ -34,11 +34,6 @@ :group 'mu4e-column-faces :prefix "mu4e-column-faces-") -(defface mu4e-column-faces-thread-subject - '((t :inherit font-lock-doc-face)) - "Face for `:thread-subject' columns." - :group 'mu4e-column-faces) - (defface mu4e-column-faces-to-from '((t :inherit font-lock-variable-name-face)) "Face for `:from-or-to', `:to', `:from', `:cc' and `:bcc' columns." @@ -94,11 +89,6 @@ "Face for `:size' columns." :group 'mu4e-column-faces) -(defface mu4e-column-faces-thread-subject - '((t :inherit font-lock-type-face)) - "Face for `:thread-subject' columns." - :group 'mu4e-column-faces) - (defface mu4e-column-faces-user-agent '((t :inherit font-lock-doc-face)) "Face for `:user-agent' columns."