From 423a9481e468e2a16d52107b427d9e9a32e3de71 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 30 Apr 2023 18:15:51 -0400 Subject: piem-am-ready-mbox: Change spelling of inserted message ID header format-patch switch to using "Message-ID" instead of "Message-Id" in git.git's ba4324c4e1 (e-mail workflow: Message-ID is spelled with ID in both capital letters, 2023-04-03). Update piem--insert-message-id-header to follow Git's change. Message-ID: <20230430221552.251335-4-kyle@kyleam.com> --- piem.el | 6 +++--- tests/piem-tests.el | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/piem.el b/piem.el index 9dc7f3e..01985f0 100644 --- a/piem.el +++ b/piem.el @@ -156,10 +156,10 @@ value passed to `git am'. If unspecified, \"mboxrd\" is used." :type 'hook) (defcustom piem-add-message-id-header nil - "Whether to add Message-Id header to non-mail patches. + "Whether to add Message-ID header to non-mail patches. If this value is non-nil and a patch returned by a function in `piem-am-ready-mbox-functions' looks like a patch that was -attached rather than sent inline, add a Message-Id header with +attached rather than sent inline, add a Message-ID header with the return value of `piem-mid'." :type 'boolean) @@ -615,7 +615,7 @@ public-inbox's configuration), return the value of (when (= header-count 3) ;; Found all the expected headers before hitting a ;; blank line. Assume we're in a header. - (insert (format "Message-Id: <%s>\n" mid)))))))) + (insert (format "Message-ID: <%s>\n" mid)))))))) (defun piem-am-ready-mbox (&optional buffer-name) "Generate a buffer containing an am-ready mbox. diff --git a/tests/piem-tests.el b/tests/piem-tests.el index 6f39a53..7f9f30f 100644 --- a/tests/piem-tests.el +++ b/tests/piem-tests.el @@ -181,7 +181,7 @@ (piem--insert-message-id-header "msg@id"))) (should-not (string-match-p - "Message-Id: " + "Message-ID: " (with-temp-buffer (insert "\ From 0d732713af1f3fb48b37430e2cd0a3033cea14f3 Mon Sep 17 00:00:00 2001 @@ -200,9 +200,9 @@ Subject: [PATCH] a (should (string-match-p (concat - (rx "Subject: [PATCH 1/2] a\nMessage-Id: \n" + (rx "Subject: [PATCH 1/2] a\nMessage-ID: \n" (one-or-more anychar) - "Subject: [PATCH 2/2] b\nMessage-Id: \n")) + "Subject: [PATCH 2/2] b\nMessage-ID: \n")) (with-temp-buffer (insert "\ From 0d732713af1f3fb48b37430e2cd0a3033cea14f3 Mon Sep 17 00:00:00 2001 -- cgit v1.2.3