[PATCH v1] emacs: Don't insert part header pseudo-buttons during reply by default.

diff --git a/08/e269bfd4fbbfdfd9d2b5d2de4c9defd6a667e4 b/08/e269bfd4fbbfdfd9d2b5d2de4c9defd6a667e4
new file mode 100644 (file)
index 0000000..a1f4570
--- /dev/null
+++ b/08/e269bfd4fbbfdfd9d2b5d2de4c9defd6a667e4
@@ -0,0 +1,103 @@
+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 D5E0E6DE1830\r
+ for <notmuch@notmuchmail.org>; Wed, 16 Mar 2016 01:40:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.158\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.158 tagged_above=-999 required=5\r
+ tests=[AWL=-0.091, 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 G92D_rS25zxD for <notmuch@notmuchmail.org>;\r
+ Wed, 16 Mar 2016 01:39:58 -0700 (PDT)\r
+Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com\r
+ [74.125.82.45]) by arlo.cworth.org (Postfix) with ESMTPS id 8A37D6DE181C for\r
+ <notmuch@notmuchmail.org>; Wed, 16 Mar 2016 01:39:58 -0700 (PDT)\r
+Received: by mail-wm0-f45.google.com with SMTP id l68so178931920wml.0\r
+ for <notmuch@notmuchmail.org>; Wed, 16 Mar 2016 01:39:58 -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=Owm4NHr/VbEnfCJOnbX0JKRGL1A50E9MmwKAJhGaC90=;\r
+ b=opoxC0a6aKdfbuuEj0BcL3AScEpIzkErmqqXV/agnSR8oFZ0BXwBp6pqFEdIploZbt\r
+ DFxGzzS+E61MZ5BtlH6ZVJ6Hre4Rcp33K4B6e4x0rmmFXSxc9FIYu9QSDSxKHLF1Wx/k\r
+ aNiFx+jXOu9N6nE1+uCIDjkSUzIADLen+MI9XGVb9Gm/M+26dHAgWH4Z6X6toT8JbITd\r
+ v+M3W4zXt/fcA7rCxkGnox4H3h9XOp4STJH7aL4pJ3aGVd03VjUYcNy7itKxVOr9g8Hb\r
+ vS441f5neo96UPRnkYv41Fw4UDFphIW7ZX0JoLUFFpu7LxXqrVjorIHUxdhMi4P+1jo+\r
+ pdiw==\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=Owm4NHr/VbEnfCJOnbX0JKRGL1A50E9MmwKAJhGaC90=;\r
+ b=GHKz+Q33rY1oV9nO3EChzm8rmlXQExRPZDUIxQ0zmJGwucKSdzDqBxDHzBgWFsJZye\r
+ 0oSpxPUpg7tJBA9OH81yqz6QCCWNR0cRlEw5CeW6yHXnjsOuPVccdiUYcQv3iAGthU2z\r
+ /vsvhzM4J31RnGz8dG1m1L9EWE/g4LYbVS8qO033AYwZOyxKXZh6m9ap1xwThj57IBZg\r
+ FnCODW0akmjn2sK+hatAgBbb1Gn8foWhbazgzXbRfREfS3iXU6gX0LmSYjvAfXn8CEVX\r
+ ddD12VUyyexTflyPfrxSaZ74GiZ0JPZsEoGh1v0utBaTuFcbDPVqgiSq56lxbsuJhs5t\r
+ vaug==\r
+X-Gm-Message-State:\r
+ AD7BkJK792/nIYIfJRvp1dQF376KQnZd5eM+VOGEpvKxNnYaiyCsDPhdcBNz2i4PoybK9w==\r
+X-Received: by 10.28.230.157 with SMTP id e29mr29190201wmi.24.1458117595530;\r
+ Wed, 16 Mar 2016 01:39:55 -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 g203sm24386560wmf.23.2016.03.16.01.39.54\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Wed, 16 Mar 2016 01:39:54 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 221f5179\r
+ for <notmuch@notmuchmail.org>; Wed, 16 Mar 2016 08:39:53 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1] emacs: Don't insert part header pseudo-buttons during\r
+ reply by default.\r
+Date: Wed, 16 Mar 2016 08:39:53 +0000\r
+Message-Id: <1458117593-32586-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: Wed, 16 Mar 2016 08:40:01 -0000\r
+\r
+Based on feedback from users, change the default value of\r
+`notmuch-mua-reply-insert-header-p-function' to\r
+`notmuch-show-reply-insert-header-p-never', with the consequence that\r
+replies will not have part header pseudo-buttons. This more closely\r
+matches the behaviour before the recent changes to the reply code.\r
+---\r
+ emacs/notmuch-mua.el | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index fcb3e95..773a000 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -94,7 +94,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."\r
+   :group 'notmuch-reply)\r
+ \r
+ (defcustom notmuch-mua-reply-insert-header-p-function\r
+-  'notmuch-show-reply-insert-header-p-trimmed\r
++  'notmuch-show-reply-insert-header-p-never\r
+   "Function to decide which parts get a header when replying.\r
+ \r
+ This function specifies which parts of a mime message with\r
+-- \r
+2.1.4\r
+\r