[PATCH v3 6/9] emacs/mua: Don't insert part headers in citations

diff --git a/6d/14ae7121fb34c7b11221cb01ba7feddd172a05 b/6d/14ae7121fb34c7b11221cb01ba7feddd172a05
new file mode 100644 (file)
index 0000000..9e33c5a
--- /dev/null
+++ b/6d/14ae7121fb34c7b11221cb01ba7feddd172a05
@@ -0,0 +1,100 @@
+Return-Path: <dme@dme.org>\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 A71A3429E36\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 q2Csq3n3wjKS for <notmuch@notmuchmail.org>;\r
+       Mon, 12 May 2014 05:29:44 -0700 (PDT)\r
+Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com\r
+       [209.85.212.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E94F1431FD4\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:34 -0700 (PDT)\r
+Received: by mail-wi0-f174.google.com with SMTP id r20so4372363wiv.1\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:33 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+       :references;\r
+       bh=i/oy1NL3S4OBUcjsYU7MHSgL5CrHolFDI46roRFEmWQ=;\r
+       b=iuXzK56ekQf1CDw3tEAv27JRVYzLt2fQFuta81a43SSitEvW8SJQAh9deSFIqMvlds\r
+       d6Xu1Ya4pUJIOoi/1Bhi+kobAJpGxV6SFc+ELJOIJLv8hhrFIkOP8Oin9DXDNeLysUCG\r
+       JpUb14kTvsay+c/lUY3fh9qdfURWrETGYXdSLEpKioTX0rgahUJK9TWZI2TSwPSOLZRs\r
+       8SEUlZqjhHlgb8QpuiX8CSaypTeOdd/O0NGKy3lG/7JBW/Vtyt+BZ2PibIl6MfwHw8zR\r
+       qp+AfcW6Q1YzTL3Vmw02SJO3Y5mWZcE8Sdvv3hrka2VSKirNpBEYNSWZl/qHmIJH1hLh\r
+       JvVA==\r
+X-Gm-Message-State:\r
+ ALoCoQmhgmfs9rJ2IqJF+h+9q824IMBC2ktdzKLtv9rh8IpYdtJpSUHx/xVu5DhjEYuwWhh2Spwj\r
+X-Received: by 10.194.62.40 with SMTP id v8mr339755wjr.91.1399897773784;\r
+       Mon, 12 May 2014 05:29:33 -0700 (PDT)\r
+Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net.\r
+       [81.149.164.25])\r
+       by mx.google.com with ESMTPSA id k2sm9993751wjq.20.2014.05.12.05.29.32\r
+       for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Mon, 12 May 2014 05:29:32 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 44D3B10B32C; Mon, 12 May 2014 13:29:29 +0100 (BST)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 6/9] emacs/mua: Don't insert part headers in citations\r
+Date: Mon, 12 May 2014 13:29:26 +0100\r
+Message-Id: <1399897769-26809-7-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.0.0.rc0\r
+In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+       <1399897769-26809-1-git-send-email-dme@dme.org>\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: Mon, 12 May 2014 12:29:48 -0000\r
+\r
+Avoid inserting part headers when rendering a message body for\r
+citation purposes.\r
+---\r
+ emacs/notmuch-mua.el | 11 +++++++----\r
+ 1 file changed, 7 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 09c922f..c800c38 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -201,10 +201,13 @@ list."\r
+       (insert "Date: " date "\n\n")\r
+ \r
+       (insert (with-temp-buffer\r
+-                ;; Don't attempt to clean up messages, excerpt\r
+-                ;; citations, etc. in the original message before\r
+-                ;; quoting.\r
+-                (let ((notmuch-show-insert-text/plain-hook nil))\r
++                (let\r
++                    ;; Don't attempt to clean up messages, excerpt\r
++                    ;; citations, etc. in the original message before\r
++                    ;; quoting.\r
++                    ((notmuch-show-insert-text/plain-hook nil)\r
++                     ;; Don't insert part buttons.\r
++                     (notmuch-show-insert-header-p-function #'notmuch-show-insert-header-p-never))\r
+                   (notmuch-show-insert-body original (plist-get original :body) 0)\r
+                   (buffer-substring-no-properties (point-min) (point-max)))))\r
+ \r
+-- \r
+2.0.0.rc0\r
+\r