From 1ddd74b003cf6b803c15a64a1e97bb754f042497 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Fri, 12 Jan 2024 02:57:25 +0100 Subject: [PATCH 1/8] bump: :email wanderlust wanderlust/flim@80b8121f05a5 -> wanderlust/flim@abdd2315006e wanderlust/semi@9370961ddcee -> wanderlust/semi@9063a4485b14 wanderlust/wanderlust@8369b2d5170a -> wanderlust/wanderlust@9fd2c65e8d69 --- modules/email/wanderlust/packages.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/email/wanderlust/packages.el b/modules/email/wanderlust/packages.el index 4d9a109a9..57afc4e87 100644 --- a/modules/email/wanderlust/packages.el +++ b/modules/email/wanderlust/packages.el @@ -5,7 +5,7 @@ ;; depends on flim, flim on apel), but they all have non-standard default ;; branches which straight cannot detect without our help. (package! apel :recipe (:branch "apel-wl") :pin "82eb2325bd149dc57b43a9ce9402c6c6183e4052") -(package! flim :recipe (:branch "flim-1_14-wl") :pin "80b8121f05a5a0d7fcfe3e54085467a646dd2028") -(package! semi :recipe (:branch "semi-1_14-wl") :pin "9370961ddcee78e389e44b36d38c3d93f8351619") +(package! flim :recipe (:branch "flim-1_14-wl") :pin "abdd2315006eb31476249223569808adb1c0f7b2") +(package! semi :recipe (:branch "semi-1_14-wl") :pin "9063a4485b148a767ea924f0e7cc78d3524ba256") -(package! wanderlust :pin "8369b2d5170a174652294835dd9a18ed21a38cb2") +(package! wanderlust :pin "9fd2c65e8d690625f35035a71e73f51f740dbe04") From 916c97bdf1add1f964ca630848bd2c5e544e21de Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:09:05 +0100 Subject: [PATCH 2/8] tweak(wanderlust): switch to alerting --- modules/email/wanderlust/config.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 23b7bf70a..021a3f996 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -70,6 +70,10 @@ (setq wl-message-id-domain wl-local-domain) + ;; Use alert for alerting + (when (fboundp 'alert) + (setq wl-biff-notify-hook '((lambda () (alert "You have new mail!" :title "Wanderlust"))))) + (when (modulep! :editor evil) ;; Neither `wl-folder-mode' nor `wl-summary-mode' are correctly defined as ;; major modes, so we cannot use `set-evil-initial-state!' here. From dbbd1f2b01010c5f784241d066ccf586167b099c Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:10:54 +0100 Subject: [PATCH 3/8] tweak(wanderlust): don't show DKIM, ARC and similar signatures --- modules/email/wanderlust/config.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 021a3f996..ce1a4bcf0 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -29,6 +29,7 @@ "^References:" "^Replied:" "^Errors-To:" + "^Mail-.*-To:" "^Lines:" "^Sender:" ".*Host:" @@ -40,7 +41,14 @@ "^MIME.*:" "^In-Reply-To:" "^Content-Transfer-Encoding:" - "^List-.*:") + "^Content-Disposition:" + "^List-.*:" + "^Received-SPF:" + "^DKIM-.*:" + "^SPF-.*:" + "^Autocrypt:" + "^ARC-.*:" + "^Authentication-Results:") wl-message-visible-field-list '("^Message-Id:" "^User-Agent:" From e09838e01ae42b1043b6e5f7262e0a91270d173f Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:13:17 +0100 Subject: [PATCH 4/8] fix(wanderlust): avoid `File name too long...` --- modules/email/wanderlust/config.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index ce1a4bcf0..f9a718355 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -20,6 +20,10 @@ wl-init-file (expand-file-name "wl.el" doom-user-dir) wl-folders-file (expand-file-name "folders.wl" doom-user-dir)) + ;; macOS allows file names up to 255 characters, + ;; use half of that size as threshold to switch to hashing + (setq elmo-msgdb-path-encode-threshold 128) + (setq wl-message-truncate-lines t wl-summary-width 120 wl-message-ignored-field-list From ebcb383c99008a25e1c4f1cb3ea2b80c645d2be6 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:18:23 +0100 Subject: [PATCH 5/8] tweak(wanderlust): do not truncate long subjects or mail lines --- modules/email/wanderlust/config.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index f9a718355..b393760c7 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -24,8 +24,8 @@ ;; use half of that size as threshold to switch to hashing (setq elmo-msgdb-path-encode-threshold 128) - (setq wl-message-truncate-lines t - wl-summary-width 120 + (setq wl-message-truncate-lines nil + wl-summary-width nil wl-message-ignored-field-list '(".*Received:" ".*Path:" From a20ca0cc0a316881546bd6aaa0fe636ae0459ab4 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:19:53 +0100 Subject: [PATCH 6/8] fix(wanderlust): enforce `wl-message-id-domain` only on automatic gmail config --- modules/email/wanderlust/config.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index b393760c7..31e16c889 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -78,9 +78,9 @@ wl-draft-folder "%[Gmail]/Drafts" wl-trash-folder "%[Gmail]/Trash" wl-fcc-force-as-read t - wl-default-spec "%")) + wl-default-spec "%") - (setq wl-message-id-domain wl-local-domain) + (setq wl-message-id-domain wl-local-domain)) ;; Use alert for alerting (when (fboundp 'alert) From a461a1f62c625dcbaaa6ccb141ac945063f32b23 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Sun, 14 Jan 2024 14:31:31 +0100 Subject: [PATCH 7/8] tweak(wanderlust): add +xface flag --- modules/email/wanderlust/README.org | 6 ++++++ modules/email/wanderlust/config.el | 5 +++++ modules/email/wanderlust/packages.el | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/modules/email/wanderlust/README.org b/modules/email/wanderlust/README.org index 21f236458..3c9f17333 100644 --- a/modules/email/wanderlust/README.org +++ b/modules/email/wanderlust/README.org @@ -15,6 +15,9 @@ - +gmail :: Enable gmail-specific configuration for mail ~To~ or ~From~ a gmail address. +- +xface :: + Enable support of [X-Face] powered by [compface]. + ** Packages - [[doom-package:wanderlust]] @@ -52,3 +55,6 @@ #+begin_quote 󱌣 This module has no appendix yet. [[doom-contrib-module:][Write one?]] #+end_quote + +[X-Face]: https://en.wikipedia.org/wiki/X-Face +[compface]: http://freecode.com/projects/compface/ diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 31e16c889..679c04f9d 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -82,6 +82,11 @@ (setq wl-message-id-domain wl-local-domain)) + ;; Use x-face only when compface installed + (when (modulep! +xface) + (autoload 'x-face-decode-message-header "x-face-e21") + (setq wl-highlight-x-face-function 'x-face-decode-message-header)) + ;; Use alert for alerting (when (fboundp 'alert) (setq wl-biff-notify-hook '((lambda () (alert "You have new mail!" :title "Wanderlust"))))) diff --git a/modules/email/wanderlust/packages.el b/modules/email/wanderlust/packages.el index 57afc4e87..48203a6bd 100644 --- a/modules/email/wanderlust/packages.el +++ b/modules/email/wanderlust/packages.el @@ -9,3 +9,9 @@ (package! semi :recipe (:branch "semi-1_14-wl") :pin "9063a4485b148a767ea924f0e7cc78d3524ba256") (package! wanderlust :pin "9fd2c65e8d690625f35035a71e73f51f740dbe04") + +(when (modulep! +xface) + (package! x-face-e21 + :recipe (:host nil :repo "https://salsa.debian.org/debian/x-face-el.git" + :files ("debian/x-face-e21.el")) + :pin "871156a776cc1bc9dd035205b6875c55db6ae215")) From 302b72d9ed0e90186d9c79730ee9b9927947495c Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Thu, 18 Jan 2024 00:40:46 +0100 Subject: [PATCH 8/8] tweak(wanderlust): sane forward tag --- modules/email/wanderlust/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el index 679c04f9d..3175268c3 100644 --- a/modules/email/wanderlust/config.el +++ b/modules/email/wanderlust/config.el @@ -26,6 +26,7 @@ (setq wl-message-truncate-lines nil wl-summary-width nil + wl-forward-subject-prefix "Fwd: " wl-message-ignored-field-list '(".*Received:" ".*Path:"