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.
This commit is contained in:
Jani Nikula 2023-11-30 18:13:19 +02:00 committed by David Bremner
parent 4f82acce17
commit 67990376b7

View file

@ -41,6 +41,9 @@ CREATE_FRAME=
ELISP= ELISP=
MAILTO= MAILTO=
HELLO= HELLO=
TO_SEP=
CC_SEP=
BCC_SEP=
# Short options compatible with mutt(1). # Short options compatible with mutt(1).
while getopts :s:c:b:i:h opt; do 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}\")" ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")"
;; ;;
--to) --to)
ELISP="${ELISP} (message-goto-to) (insert \"${OPTARG}, \")" ELISP="${ELISP} (message-goto-to) (insert \"${TO_SEP}${OPTARG}\")"
TO_SEP=", "
;; ;;
--cc|c) --cc|c)
ELISP="${ELISP} (message-goto-cc) (insert \"${OPTARG}, \")" ELISP="${ELISP} (message-goto-cc) (insert \"${CC_SEP}${OPTARG}\")"
CC_SEP=", "
;; ;;
--bcc|b) --bcc|b)
ELISP="${ELISP} (message-goto-bcc) (insert \"${OPTARG}, \")" ELISP="${ELISP} (message-goto-bcc) (insert \"${BCC_SEP}${OPTARG}\")"
BCC_SEP=", "
;; ;;
--body|i) --body|i)
ELISP="${ELISP} (message-goto-body) (insert-file \"${OPTARG}\")" ELISP="${ELISP} (message-goto-body) (insert-file \"${OPTARG}\")"