[PATCH v6 0/6] emacs: Improve the cited message included in replies

diff --git a/7f/6a04297b866dfb21f7930ec07c0bcfe7aecfca b/7f/6a04297b866dfb21f7930ec07c0bcfe7aecfca
new file mode 100644 (file)
index 0000000..72c56b4
--- /dev/null
+++ b/7f/6a04297b866dfb21f7930ec07c0bcfe7aecfca
@@ -0,0 +1,103 @@
+Return-Path: <markwalters1009@gmail.com>\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 93F136DE1348\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:50 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.222\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.222 tagged_above=-999 required=5 tests=[AWL=-0.208,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, FREEMAIL_REPLY=1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,\r
+ SPF_PASS=-0.001] 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 10nXgu5pjWLT for <notmuch@notmuchmail.org>;\r
+ Sat, 20 Feb 2016 10:24:49 -0800 (PST)\r
+Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com\r
+ [74.125.82.46]) by arlo.cworth.org (Postfix) with ESMTPS id 899DC6DE0FB6 for\r
+ <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:48 -0800 (PST)\r
+Received: by mail-wm0-f46.google.com with SMTP id c200so118211180wme.0\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:48 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id;\r
+ bh=M4N5NaoSmy+rXT/BhEdWJqLwfh6Z3LlaI8LAp3K8UfE=;\r
+ b=vdGxgl9tJbu5KaVqG87kviZtb3CP9M5YbxQ16Ml3yp8m37UYN118omvzmvOqLEHgds\r
+ sS9kQUa9rZP+b/+V002u0NTeUF9RI1PzMmXUNWcf4pVcu/LL+tJpFe3EBX/IAi5xPy22\r
+ +QeujeDOx2FFc1vtgwrcaM0EkBEoUQrLRwFyQx4qGnwjYWfKv2oF7fxANOpkVzGSvtG8\r
+ 0QadcrYBMdcdLGT0ptw4pMlrc7K9hUiuzlz4ddEKqpHn6tC+jUwp/FTkXRHLed9nvxJ6\r
+ gSD4vPBpVV6kWKQMoCY1Vpp5voi2K2X1i4maCj7yO2gmvHZnBRyIgwoQB+eBEbbvMvwr\r
+ dsIw==\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:cc:subject:date:message-id;\r
+ bh=M4N5NaoSmy+rXT/BhEdWJqLwfh6Z3LlaI8LAp3K8UfE=;\r
+ b=T1YN15WR7iUDRHr6dH3eaGOOmdKLkjBdJGrNsNh0j3E7HQ4UDYI7hSmN/NkS9nTAaD\r
+ eF4UuODYIy7KvVTbIvyXjuY4Ky4r4hq+kgZLkIyNtxbdLsSAMXrKGuTUSBTUsdcXYaoo\r
+ /yRUGCpk4+ZcGJXlGUfHcSe+vwbuJMMrbvdoQAmtNJEigBJN/taM+KSAm1GlQDw/NH2Q\r
+ Gf6i4uuUGxaSDCATC9dYpdM4v7E2GcT2V60t34dEmi+HY7YUfGk04zkSypZsfIUg/GmH\r
+ RAe6n747+/ojB0A4+5V7gPriSNtY3vwxCONgsRUPAjiFbEKCt8sxzVXnyHp3RfqbiSgD\r
+ AgvA==\r
+X-Gm-Message-State:\r
+ AG10YOQM7TGPWhPrd+x9n3HgnMx6ZsgzowZeUDwaG/9DD3/BxprRK/sNmqShSxwE+4VQvA==\r
+X-Received: by 10.28.132.212 with SMTP id g203mr3784483wmd.30.1455992685730;\r
+ Sat, 20 Feb 2016 10:24:45 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id v2sm13114159wmd.24.2016.02.20.10.24.44\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 20 Feb 2016 10:24:45 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 0/6] emacs: Improve the cited message included in replies\r
+Date: Sat, 20 Feb 2016 18:24:34 +0000\r
+Message-Id: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\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: Sat, 20 Feb 2016 18:24:50 -0000\r
+\r
+This is version 6 of this patch set -- the previous version is at\r
+id:1455475199-32622-1-git-send-email-markwalters1009@gmail.com\r
+\r
+The end result should be exactly the same as the previous series but\r
+the tests should now pass at all intermediate points. To achieve this\r
+I moved the part of the code allowing the new reply to code to say\r
+"don't display buttons", before the new reply code change (patch 4),\r
+and merged the one test fix needed with that main change.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+David Edmondson (6):\r
+  emacs/show: Re-arrange determination if a part header is necessary\r
+  emacs/show: Make the insertion of part headers overridable.\r
+  emacs/show: Accommodate the lack of part header buttons\r
+  emacs/mua: Generate improved cited text for replies\r
+  emacs/show: Remove the 'no-buttons option of\r
+    `notmuch-show-insert-bodypart'\r
+  emacs/mua: Let user specify which parts get a header in citations.\r
+\r
+ emacs/notmuch-mua.el  |  60 ++++++++++-----------\r
+ emacs/notmuch-show.el | 144 +++++++++++++++++++++++++++++++-------------------\r
+ test/T310-emacs.sh    |  32 +++++++++++\r
+ test/test-lib.el      |   4 ++\r
+ 4 files changed, 156 insertions(+), 84 deletions(-)\r
+\r
+-- \r
+2.1.4\r
+\r