[PATCH v4 0/7] emacs: Improve the cited message included in replies

diff --git a/1e/5971a45aa6cb89f85f48e60f32402ba74ec21d b/1e/5971a45aa6cb89f85f48e60f32402ba74ec21d
new file mode 100644 (file)
index 0000000..f858b93
--- /dev/null
+++ b/1e/5971a45aa6cb89f85f48e60f32402ba74ec21d
@@ -0,0 +1,111 @@
+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 CC5766DE1641\r
+ for <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:04:45 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.133\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.133 tagged_above=-999 required=5 tests=[AWL=0.437,\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, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-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 HIU3WSe7P-Bw for <notmuch@notmuchmail.org>;\r
+ Sat,  7 Nov 2015 03:04:44 -0800 (PST)\r
+Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com\r
+ [209.85.212.171])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id A62B16DE1502\r
+ for <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:04:43 -0800 (PST)\r
+Received: by wicll6 with SMTP id ll6so44094752wic.0\r
+ for <notmuch@notmuchmail.org>; Sat, 07 Nov 2015 03:04:41 -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=v08JaS5pM1YcDRXdHdewCd0pjNfHAWTnL1FC5b3KrdA=;\r
+ b=DgEJXhz0oCzX6QuJZOPsSN1HTew1R7iZoMW8BPro9+Ri2m6+Q+mOSdzFhqLLXk/nwz\r
+ 5Xwn2E7ryHamUYGl6ulBrU5afjJIkDuOi1B4kayiC+z8rYdL2jmnWPU2nBcVNMGyTAsc\r
+ n2w8DGfoIjUeF6hA8ivCuUrUR3n5wPrIXeIhqKBCOAoINcTjsKZVI7SSOxuwg7Cu+ynY\r
+ uLs4QtAoFO3N22Dk6OjTNvisOglo8CUDQesa+9GpefBLgI56tJc05WO8YVnhkUwy0dx6\r
+ TSQkFXOJzIp8aCIUHHceLdpODiU7zU94N584ufEL6RYNHHtpWhZ9OODIubYQWzgX74CM\r
+ DWIw==\r
+X-Received: by 10.194.122.230 with SMTP id lv6mr22469680wjb.2.1446894281519;\r
+ Sat, 07 Nov 2015 03:04:41 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id r12sm3424901wmd.17.2015.11.07.03.04.40\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 07 Nov 2015 03:04:40 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 0/7] emacs: Improve the cited message included in replies\r
+Date: Sat,  7 Nov 2015 11:04:29 +0000\r
+Message-Id: <1446894276-7814-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, 07 Nov 2015 11:04:45 -0000\r
+\r
+This is a rebase and somewhat tweaked version of dme's series from last year\r
+id:1399897769-26809-1-git-send-email-dme@dme.org\r
+\r
+One particular motivation for this series is that it fixes a long\r
+standing bug we have that replying to a message with an rfc822 part\r
+completely omits that part. It also fixes the bug whereby we don't\r
+include application/octet-stream parts which are actually text/plain\r
+(and thus are displayed in show mode).\r
+\r
+This series makes the reply code use the same code as the show code so\r
+everything works as expected: the reply buffer looks essentially the\r
+same as the show buffer.\r
+\r
+There is one slight difference: the user might want different part\r
+headers displayed when replying; both because the audience is\r
+different (a non-notmuch using recipient) and because the buttons\r
+don't "work" (you can't click on them to show or view a part).\r
+\r
+Dme and I disagree on which of these we would like to see so make that\r
+customisable.\r
+\r
+The key change is patch 3 which switches how reply works. Also note\r
+that patch 2 is almost all whitespace change as the changes modify the\r
+indentation.\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: 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/show: Make the insertion of part headers overridable.\r
+  emacs/mua: Let user specify which parts get a header in citations.\r
+\r
+Mark Walters (1):\r
+  test: fix the tests for the new reply code\r
+\r
+ emacs/notmuch-mua.el  |  60 ++++++++++-----------\r
+ emacs/notmuch-show.el | 141 +++++++++++++++++++++++++++++++-------------------\r
+ test/T310-emacs.sh    |  32 ++++++++++++\r
+ test/test-lib.el      |   4 ++\r
+ 4 files changed, 155 insertions(+), 82 deletions(-)\r
+\r
+-- \r
+2.1.4\r
+\r