From 67990376b7e03f2ca4b78569b143713b76b6e946 Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani@nikula.org>
Date: Thu, 30 Nov 2023 18:13:19 +0200
Subject: [PATCH 1/4] notmuch-emacs-mua: avoid extra separators at the end of
 the line

Currently the --to/--cc/--bcc options add "user@example.com, " to the
message headers, with the the unnecessary ", " separator after the
last address, regardless of how many addresses are being added.

This used to be fine, but with recent emacs mm, trying to send the
email with the trailing commas leads to prompt:

  Email address  looks invalid; send anyway? (y or n)

Fix this by only adding the commas between addresses, avoiding the
trailing commas.
---
 emacs/notmuch-emacs-mua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/emacs/notmuch-emacs-mua b/emacs/notmuch-emacs-mua
index a5214977..254e6407 100755
--- a/emacs/notmuch-emacs-mua
+++ b/emacs/notmuch-emacs-mua
@@ -41,6 +41,9 @@ CREATE_FRAME=
 ELISP=
 MAILTO=
 HELLO=
+TO_SEP=
+CC_SEP=
+BCC_SEP=
 
 # Short options compatible with mutt(1).
 while getopts :s:c:b:i:h opt; do
@@ -86,13 +89,16 @@ while getopts :s:c:b:i:h opt; do
 	    ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")"
 	    ;;
 	--to)
-	    ELISP="${ELISP} (message-goto-to) (insert \"${OPTARG}, \")"
+	    ELISP="${ELISP} (message-goto-to) (insert \"${TO_SEP}${OPTARG}\")"
+	    TO_SEP=", "
 	    ;;
 	--cc|c)
-	    ELISP="${ELISP} (message-goto-cc) (insert \"${OPTARG}, \")"
+	    ELISP="${ELISP} (message-goto-cc) (insert \"${CC_SEP}${OPTARG}\")"
+	    CC_SEP=", "
 	    ;;
 	--bcc|b)
-	    ELISP="${ELISP} (message-goto-bcc) (insert \"${OPTARG}, \")"
+	    ELISP="${ELISP} (message-goto-bcc) (insert \"${BCC_SEP}${OPTARG}\")"
+	    BCC_SEP=", "
 	    ;;
 	--body|i)
 	    ELISP="${ELISP} (message-goto-body) (insert-file \"${OPTARG}\")"

From 21daefc17872484d5f6398f6446fbf2d3cf341ac Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Fri, 1 Dec 2023 07:38:55 -0400
Subject: [PATCH 2/4] version: bump to 0.38.2

---
 bindings/python/notmuch/version.py | 2 +-
 version.txt                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 1779d8cc..f4fd171d 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.38.1'
+__VERSION__ = '0.38.2'
 SOVERSION = '5'
diff --git a/version.txt b/version.txt
index bb22182d..f2e78d49 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.38.1
+0.38.2

From b413eb805ecf10083ed9676ccfd0e8f1dee29aac Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Fri, 1 Dec 2023 07:50:27 -0400
Subject: [PATCH 3/4] NEWS for 0.38.2

---
 NEWS | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/NEWS b/NEWS
index a7c67445..315f4136 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Notmuch 0.38.2 (2023-12-01)
+===========================
+
+Library
+-------
+
+Make sorting of string maps lexicographic on (key,value) pairs. This
+avoids some test failures due to variation in message property output
+order.
+
+Emacs
+-----
+
+Avoid extra separators after the last address in `notmuch-emacs-mua`.
+
+
 Notmuch 0.38.1 (2023-10-26)
 ===========================
 

From c769658360e10a6d01a4134e680e2f498741bc5c Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Fri, 1 Dec 2023 07:51:31 -0400
Subject: [PATCH 4/4] debian: changelog for 0.38.2-1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1a333385..75765b6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.38.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+
+ -- David Bremner <bremner@debian.org>  Fri, 01 Dec 2023 07:51:09 -0400
+
 notmuch (0.38.1-1) unstable; urgency=medium
 
   * New upstream bugfix release