[PATCH v1] emacs: Don't indent multipart sub-parts during reply.

diff --git a/1e/76476ae1cecb79c55216b03b0c3dacd5a35018 b/1e/76476ae1cecb79c55216b03b0c3dacd5a35018
new file mode 100644 (file)
index 0000000..84cc5fd
--- /dev/null
+++ b/1e/76476ae1cecb79c55216b03b0c3dacd5a35018
@@ -0,0 +1,105 @@
+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 arlo.cworth.org (Postfix) with ESMTP id 2D9426DE012F\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 01:04:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.178\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.178 tagged_above=-999 required=5\r
+ tests=[AWL=-0.111, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id bUkyyYru5_8b for <notmuch@notmuchmail.org>;\r
+ Tue, 12 Apr 2016 01:04:08 -0700 (PDT)\r
+Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com\r
+ [74.125.82.53]) by arlo.cworth.org (Postfix) with ESMTPS id 4F2766DE0127 for\r
+ <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 01:04:08 -0700 (PDT)\r
+Received: by mail-wm0-f53.google.com with SMTP id u206so16675275wme.1\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 01:04:08 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:date:message-id;\r
+ bh=67BKMmg8T9ZHlF7JtZTXgxY8kKbjEv2qQh2OVlkKqSo=;\r
+ b=RXn6ZnEy2zMckG08ucru+VD1flDRGY1U2qT9gyGGGEaJ7LCgudvjfb7FLJ9/mY6Fc6\r
+ LrX0ZHbC8LzqX7M9wdRz3jkY2ptiiPTDx6eeyEeOH9ohLYYRHY8kIlu3B+RbtZ9ezrG+\r
+ uSSTXsDK6inGrfykxWEBVpazIKccitm64ddlvb8rcYwVkNZZkbH0WnDLgi4iKL67JkCK\r
+ xzYeyJLiA/Bm0S8qYu+jDcTbcIoakJOtjk8Azt7lT95PPxBd2AJJfh8QWRU8uEFhHVu1\r
+ SuT/POh6fDX5RW3QBsb2Dfm/CSWiCVLTreNHnrwZih4//sZP6RH6jUKdya5L6tAJjxi/\r
+ b5wA==\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;\r
+ bh=67BKMmg8T9ZHlF7JtZTXgxY8kKbjEv2qQh2OVlkKqSo=;\r
+ b=QTukE51A1atDbaG/kICqjvS7PNHTCqQxS1EQ0OVL8inpHzVcNoqWs/rCEUuQeCVLpY\r
+ GSU3A7nBuTOSXW4isDPUY7zK0GiHtBj61oGSp1PAx+ZPoA6Ceb+KLyuhaDiLjMPgbU8u\r
+ +QoLRfuvjvO7qlFmVz2YWTPuhUrIdQaumYnKlqtrTgZGaLuU520Dlg91wLBaZKmeTjNA\r
+ P3I0UjGmmE5SqChS5OYhNWRGJo5CmJZscpbMgDJWoecd8pej5ejun8PtBFfke9KatNgK\r
+ 9QPGas0tslqz+P7kwI5bXTbyM0sq89QfsYA5V3257U1nr4ejxsuzIDT7Zg9hdNHfTND3\r
+ t3WQ==\r
+X-Gm-Message-State:\r
+ AOPr4FUx74dOd8mD0a4agflVcAVaFVow5KdyTmZt5DXYrdDn2FedW/bjUdkbEC5hud+2lw==\r
+X-Received: by 10.28.179.7 with SMTP id c7mr2654760wmf.46.1460448246640;\r
+ Tue, 12 Apr 2016 01:04:06 -0700 (PDT)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id jk1sm31967016wjb.27.2016.04.12.01.04.05\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 12 Apr 2016 01:04:05 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 0107e406\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 08:04:04 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1] emacs: Don't indent multipart sub-parts during reply.\r
+Date: Tue, 12 Apr 2016 09:04:04 +0100\r
+Message-Id: <1460448244-31134-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 12 Apr 2016 08:04:17 -0000\r
+\r
+When generating cited messages for replay, override any existing\r
+setting for `notmuch-show-indent-multipart' to ensure that no\r
+indentation occurs.\r
+---\r
+\r
+In response to id:87oa9fsl9i.fsf@alice.fifthhorseman.net.\r
+\r
+ emacs/notmuch-mua.el | 4 +++-\r
+ 1 file changed, 3 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 935cbd3..31e6360 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -248,7 +248,9 @@ mutiple parts get a header."\r
+                      ;; Don't omit long parts.\r
+                      (notmuch-show-max-text-part-size 0)\r
+                      ;; Insert headers for parts as appropriate for replying.\r
+-                     (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function))\r
++                     (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)\r
++                     ;; Don't indent multipart sub-parts.\r
++                     (notmuch-show-indent-multipart nil))\r
+                   (notmuch-show-insert-body original (plist-get original :body) 0)\r
+                   (buffer-substring-no-properties (point-min) (point-max)))))\r
+ \r
+-- \r
+2.1.4\r
+\r