From 339d841415a50ff3c41832dfd4d30679bbf4905b Mon Sep 17 00:00:00 2001 From: Protesilaos Stavrou Date: Sat, 27 Aug 2022 05:29:56 +0300 Subject: [PATCH 1/2] mu4e-compose: simplify mu4e~compose-remap-faces --- mu4e/mu4e-compose.el | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el index ffb556d2..4b4b56de 100644 --- a/mu4e/mu4e-compose.el +++ b/mu4e/mu4e-compose.el @@ -315,24 +315,16 @@ set, this simply executes `fill-paragraph'." Our parent `message-mode' uses font-locking for the compose buffers; lets remap its faces so it uses the ones for mu4e." ;; normal headers - (face-remap-add-relative 'message-header-name - '((:inherit mu4e-header-field-face))) - (face-remap-add-relative 'message-header-other - '((:inherit mu4e-header-value-face))) + (face-remap-add-relative 'message-header-name 'mu4e-header-field-face) + (face-remap-add-relative 'message-header-other 'mu4e-header-value-face) ;; special headers - (face-remap-add-relative 'message-header-from - '((:inherit mu4e-contact-face))) - (face-remap-add-relative 'message-header-to - '((:inherit mu4e-contact-face))) - (face-remap-add-relative 'message-header-cc - '((:inherit mu4e-contact-face))) - (face-remap-add-relative 'message-header-bcc - '((:inherit mu4e-contact-face))) - (face-remap-add-relative 'message-header-subject - '((:inherit mu4e-special-header-value-face))) + (face-remap-add-relative 'message-header-from 'mu4e-contact-face) + (face-remap-add-relative 'message-header-to 'mu4e-contact-face) + (face-remap-add-relative 'message-header-cc 'mu4e-contact-face) + (face-remap-add-relative 'message-header-bcc 'mu4e-contact-face) + (face-remap-add-relative 'message-header-subject 'mu4e-special-header-value-face) ;; citation - (face-remap-add-relative 'message-cited-text - '((:inherit mu4e-cited-1-face)))) + (face-remap-add-relative 'message-cited-text 'mu4e-cited-1-face)) (define-derived-mode mu4e-compose-mode message-mode "mu4e:compose" "Major mode for the mu4e message composition, derived from `message-mode'. From 8c42c43fd735b7edf7e473661aa67f185e1b7136 Mon Sep 17 00:00:00 2001 From: Protesilaos Stavrou Date: Sat, 27 Aug 2022 05:51:16 +0300 Subject: [PATCH 2/2] mu4e-compose: remove remap for unused face The mu4e-cited-1-face does not exist any more, per commit a4707afe1218330eb5bd0a6cc0b2984844643d7e. --- mu4e/mu4e-compose.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el index 4b4b56de..66f9c49c 100644 --- a/mu4e/mu4e-compose.el +++ b/mu4e/mu4e-compose.el @@ -322,9 +322,7 @@ buffers; lets remap its faces so it uses the ones for mu4e." (face-remap-add-relative 'message-header-to 'mu4e-contact-face) (face-remap-add-relative 'message-header-cc 'mu4e-contact-face) (face-remap-add-relative 'message-header-bcc 'mu4e-contact-face) - (face-remap-add-relative 'message-header-subject 'mu4e-special-header-value-face) - ;; citation - (face-remap-add-relative 'message-cited-text 'mu4e-cited-1-face)) + (face-remap-add-relative 'message-header-subject 'mu4e-special-header-value-face)) (define-derived-mode mu4e-compose-mode message-mode "mu4e:compose" "Major mode for the mu4e message composition, derived from `message-mode'.