--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id BAC00431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 02:13:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id fO4cbGedxEYX for <notmuch@notmuchmail.org>;\r
+ Sat, 31 Mar 2012 02:13:46 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id CCE66431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 02:13:45 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SDuNU-0000Ks-1z; Sat, 31 Mar 2012 10:13:44 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SDuNT-0001LC-L3; Sat, 31 Mar 2012 10:13:43 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>, notmuch@notmuchmail.org\r
+Subject: Re: [BUG/PATCH v2 1/2] emacs: Fix header problem in reply for emacs\r
+ 23.2\r
+In-Reply-To: <1333038410-17927-2-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1333038410-17927-1-git-send-email-awg+notmuch@xvx.ca>\r
+ <1333038410-17927-2-git-send-email-awg+notmuch@xvx.ca>\r
+User-Agent: Notmuch/0.12+65~g8bf1842 (http://notmuchmail.org) Emacs/23.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 31 Mar 2012 10:13:53 +0100\r
+Message-ID: <87k42116b2.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: f595d6809c5f3991d98c43a8d9f4ce2c (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 31 Mar 2012 09:13:46 -0000\r
+\r
+Adam Wolfe Gordon <awg+notmuch@xvx.ca> writes:\r
+\r
+> The new reply code used strings instead of symbols for header names,\r
+> which message-mail is OK with on emacs 23.3, but not 23.2. The symptom\r
+> is that on 23.2 (and presumably on earlier versions) the reply message\r
+> would end up with two of some headers.\r
+>\r
+> This fixes the problem by converting the header names to symbols of\r
+> the type message.el usually expects before passing the headers to\r
+> message-mail.\r
+\r
+A few minor comments:\r
+\r
+I think this code applies on top of \r
+ id:"1332941635-21019-2-git-send-email-awg+notmuch@xvx.ca" and \r
+ id:"1332941635-21019-3-git-send-email-awg+notmuch@xvx.ca"\r
+\r
+Secondly it seems a little odd that the second patch above changes the\r
+header stuff from 'From to "From" and then this patch changes it back\r
+again. This is probably only a matter of a tidy history but I have to\r
+admit I am confused about why the reply from alternate address still\r
+works (but it does seem to)\r
+\r
+Finally, there is a trailing white-space in the second patch in this\r
+series.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+> ---\r
+> emacs/notmuch-lib.el | 7 +++++--\r
+> emacs/notmuch-mua.el | 12 ++++++------\r
+> 2 files changed, 11 insertions(+), 8 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index c146748..0effe24 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -232,9 +232,12 @@ the given type."\r
+> (or (plist-get part :content)\r
+> (notmuch-get-bodypart-internal (concat "id:" (plist-get msg :id)) nth process-crypto)))\r
+> \r
+> -(defun notmuch-plist-to-alist (plist)\r
+> +;; Converts a plist of headers to an alist of headers. The input plist should\r
+> +;; have symbols of the form :Header as keys, and the resulting alist will have\r
+> +;; symbols of the form 'Header as keys.\r
+> +(defun notmuch-headers-plist-to-alist (plist)\r
+> (loop for (key value . rest) on plist by #'cddr\r
+> - collect (cons (substring (symbol-name key) 1) value)))\r
+> + collect (cons (intern (substring (symbol-name key) 1)) value)))\r
+> \r
+> ;; Compatibility functions for versions of emacs before emacs 23.\r
+> ;;\r
+> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+> index 9805d79..cfa3d61 100644\r
+> --- a/emacs/notmuch-mua.el\r
+> +++ b/emacs/notmuch-mua.el\r
+> @@ -127,7 +127,7 @@ list."\r
+> ((same-window-regexps '("\\*mail .*")))\r
+> (notmuch-mua-mail (plist-get reply-headers :To)\r
+> (plist-get reply-headers :Subject)\r
+> - (notmuch-plist-to-alist reply-headers)))\r
+> + (notmuch-headers-plist-to-alist reply-headers)))\r
+> ;; Insert the message body - but put it in front of the signature\r
+> ;; if one is present\r
+> (goto-char (point-max))\r
+> @@ -185,11 +185,11 @@ OTHER-ARGS are passed through to `message-mail'."\r
+> (when notmuch-mua-user-agent-function\r
+> (let ((user-agent (funcall notmuch-mua-user-agent-function)))\r
+> (when (not (string= "" user-agent))\r
+> - (push (cons "User-Agent" user-agent) other-headers))))\r
+> + (push (cons 'User-Agent user-agent) other-headers))))\r
+> \r
+> - (unless (assoc "From" other-headers)\r
+> - (push (cons "From" (concat\r
+> - (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))\r
+> + (unless (assq 'From other-headers)\r
+> + (push (cons 'From (concat\r
+> + (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))\r
+> \r
+> (apply #'message-mail to subject other-headers other-args)\r
+> (message-sort-headers)\r
+> @@ -250,7 +250,7 @@ the From: address first."\r
+> (interactive "P")\r
+> (let ((other-headers\r
+> (when (or prompt-for-sender notmuch-always-prompt-for-sender)\r
+> - (list (cons "From" (notmuch-mua-prompt-for-sender))))))\r
+> + (list (cons 'From (notmuch-mua-prompt-for-sender))))))\r
+> (notmuch-mua-mail nil nil other-headers)))\r
+> \r
+> (defun notmuch-mua-new-forward-message (&optional prompt-for-sender)\r
+> -- \r
+> 1.7.5.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff