From 1e0df692b645d19e9e2b29049545775a19528d02 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Fri, 30 Mar 2012 10:26:50 +1800 Subject: [PATCH] [BUG/PATCH v2 2/2] emacs: Fix the References header in reply --- f2/d528c77ace8094147cb2a17258adde40a65a85 | 117 ++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 f2/d528c77ace8094147cb2a17258adde40a65a85 diff --git a/f2/d528c77ace8094147cb2a17258adde40a65a85 b/f2/d528c77ace8094147cb2a17258adde40a65a85 new file mode 100644 index 000000000..b9bc82562 --- /dev/null +++ b/f2/d528c77ace8094147cb2a17258adde40a65a85 @@ -0,0 +1,117 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id A712C429E34 + for ; Thu, 29 Mar 2012 09:27:01 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id xk6Enu5u5q1H for ; + Thu, 29 Mar 2012 09:26:59 -0700 (PDT) +Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) + by olra.theworths.org (Postfix) with ESMTP id D72D1431E62 + for ; Thu, 29 Mar 2012 09:26:56 -0700 (PDT) +Received: from pd4ml2so-ssvc.prod.shaw.ca ([10.0.141.136]) + by pd3mo1so-svcs.prod.shaw.ca with ESMTP; 29 Mar 2012 10:26:56 -0600 +X-Cloudmark-SP-Filtered: true +X-Cloudmark-SP-Result: v=1.1 cv=OAanaFJXxrU4geOiks1gk5+7cCarKPEnRlgRWHXA/ts= + c=1 sm=1 + a=CTBuJuvJAFQA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17 + a=QtFthfrC4rEx_lj7qzYA:9 a=S68_BOFbyGUJK95SUOAA:7 + a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 +Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56]) + by pd4ml2so-dmz.prod.shaw.ca with ESMTP; 29 Mar 2012 10:26:56 -0600 +Received: by lagos.xvx.ca (Postfix, from userid 1000) + id 5DB158004204; Thu, 29 Mar 2012 10:26:56 -0600 (MDT) +From: Adam Wolfe Gordon +To: notmuch@notmuchmail.org +Subject: [BUG/PATCH v2 2/2] emacs: Fix the References header in reply +Date: Thu, 29 Mar 2012 10:26:50 -0600 +Message-Id: <1333038410-17927-3-git-send-email-awg+notmuch@xvx.ca> +X-Mailer: git-send-email 1.7.5.4 +In-Reply-To: <1333038410-17927-1-git-send-email-awg+notmuch@xvx.ca> +References: <1333038410-17927-1-git-send-email-awg+notmuch@xvx.ca> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 29 Mar 2012 16:27:02 -0000 + +In the new reply code, the References header gets inserted by +message.el using a function called message-shorten-references. Unlike +all the other header-inserting functions, it doesn't put a newline +after the header, causing the next header to end up on the same +line. In our case, this header happened to be User-Agent, so it's hard +to notice. This is probably a bug in message.el, but we need to work +around it. + +This fixes the problem by wrapping message-shorten-references in a +function that inserts a newline after if necessary. This should +protect against the message.el bug being fixed in the future. +--- + emacs/notmuch-mua.el | 28 +++++++++++++++++++++++++--- + 1 files changed, 25 insertions(+), 3 deletions(-) + +diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +index cfa3d61..9f279d9 100644 +--- a/emacs/notmuch-mua.el ++++ b/emacs/notmuch-mua.el +@@ -90,6 +90,15 @@ list." + else if (notmuch-match-content-type (plist-get part :content-type) "text/*") + collect part)) + ++;; There is a bug in emacs 23's message.el that results in a newline ++;; not being inserted after the References header, so the next header ++;; is concatenated to the end of it. This function fixes the problem, ++;; while guarding against the possibility that some current or future ++;; version of emacs has the bug fixed. ++(defun notmuch-mua-insert-references (original-func header references) ++ (funcall original-func header references) ++ (unless (bolp) (insert "\n"))) ++ + (defun notmuch-mua-reply (query-string &optional sender reply-all) + (let ((args '("reply" "--format=json")) + reply +@@ -125,9 +134,22 @@ list." + ;; Overlay the composition window on that being used to read + ;; the original message. + ((same-window-regexps '("\\*mail .*"))) +- (notmuch-mua-mail (plist-get reply-headers :To) +- (plist-get reply-headers :Subject) +- (notmuch-headers-plist-to-alist reply-headers))) ++ ++ ;; We modify message-header-format-alist to get around a bug in message.el. ++ ;; See the comment above on notmuch-mua-insert-references. ++ (let ((message-header-format-alist ++ (loop for pair in message-header-format-alist ++ if (eq (car pair) 'References) ++ collect (cons 'References ++ (apply-partially ++ 'notmuch-mua-insert-references ++ (cdr pair))) ++ else ++ collect pair))) ++ (notmuch-mua-mail (plist-get reply-headers :To) ++ (plist-get reply-headers :Subject) ++ (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)) +-- +1.7.5.4 + -- 2.26.2