Adam Wolfe Gordon <awg+notmuch@xvx.ca> writes: > The new reply code used strings instead of symbols for header names, > which message-mail is OK with on emacs 23.3, but not 23.2. The symptom > is that on 23.2 (and presumably on earlier versions) the reply message > would end up with two of some headers. > > This fixes the problem by converting the header names to symbols of > the type message.el usually expects before passing the headers to > message-mail. A few minor comments: I think this code applies on top of id:"1332941635-21019-2-git-send-email-awg+notmuch@xvx.ca" and id:"1332941635-21019-3-git-send-email-awg+notmuch@xvx.ca" Secondly it seems a little odd that the second patch above changes the header stuff from 'From to "From" and then this patch changes it back again. This is probably only a matter of a tidy history but I have to admit I am confused about why the reply from alternate address still works (but it does seem to) Finally, there is a trailing white-space in the second patch in this series. Best wishes Mark > --- > emacs/notmuch-lib.el | 7 +++++-- > emacs/notmuch-mua.el | 12 ++++++------ > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el > index c146748..0effe24 100644 > --- a/emacs/notmuch-lib.el > +++ b/emacs/notmuch-lib.el > @@ -232,9 +232,12 @@ the given type." > (or (plist-get part :content) > (notmuch-get-bodypart-internal (concat "id:" (plist-get msg :id)) nth process-crypto))) > > -(defun notmuch-plist-to-alist (plist) > +;; Converts a plist of headers to an alist of headers. The input plist should > +;; have symbols of the form :Header as keys, and the resulting alist will have > +;; symbols of the form 'Header as keys. > +(defun notmuch-headers-plist-to-alist (plist) > (loop for (key value . rest) on plist by #'cddr > - collect (cons (substring (symbol-name key) 1) value))) > + collect (cons (intern (substring (symbol-name key) 1)) value))) > > ;; Compatibility functions for versions of emacs before emacs 23. > ;; > diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el > index 9805d79..cfa3d61 100644 > --- a/emacs/notmuch-mua.el > +++ b/emacs/notmuch-mua.el > @@ -127,7 +127,7 @@ list." > ((same-window-regexps '("\\*mail .*"))) > (notmuch-mua-mail (plist-get reply-headers :To) > (plist-get reply-headers :Subject) > - (notmuch-plist-to-alist reply-headers))) > + (notmuch-headers-plist-to-alist reply-headers))) > ;; Insert the message body - but put it in front of the signature > ;; if one is present > (goto-char (point-max)) > @@ -185,11 +185,11 @@ OTHER-ARGS are passed through to `message-mail'." > (when notmuch-mua-user-agent-function > (let ((user-agent (funcall notmuch-mua-user-agent-function))) > (when (not (string= "" user-agent)) > - (push (cons "User-Agent" user-agent) other-headers)))) > + (push (cons 'User-Agent user-agent) other-headers)))) > > - (unless (assoc "From" other-headers) > - (push (cons "From" (concat > - (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers)) > + (unless (assq 'From other-headers) > + (push (cons 'From (concat > + (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers)) > > (apply #'message-mail to subject other-headers other-args) > (message-sort-headers) > @@ -250,7 +250,7 @@ the From: address first." > (interactive "P") > (let ((other-headers > (when (or prompt-for-sender notmuch-always-prompt-for-sender) > - (list (cons "From" (notmuch-mua-prompt-for-sender)))))) > + (list (cons 'From (notmuch-mua-prompt-for-sender)))))) > (notmuch-mua-mail nil nil other-headers))) > > (defun notmuch-mua-new-forward-message (&optional prompt-for-sender) > -- > 1.7.5.4 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch