[PATCH v4 6/7] emacs/mua: Let user specify which parts get a header in citations.

diff --git a/24/faa7a340a3e09bcaef0f956d7c559052334a5b b/24/faa7a340a3e09bcaef0f956d7c559052334a5b
new file mode 100644 (file)
index 0000000..f14ac05
--- /dev/null
+++ b/24/faa7a340a3e09bcaef0f956d7c559052334a5b
@@ -0,0 +1,156 @@
+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 1653A6DE199D\r
+ for <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:05:07 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.204\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.204 tagged_above=-999 required=5 tests=[AWL=0.074, \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,\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 4A70BRKMDcnx for <notmuch@notmuchmail.org>;\r
+ Sat,  7 Nov 2015 03:05:05 -0800 (PST)\r
+Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com\r
+ [74.125.82.51]) by arlo.cworth.org (Postfix) with ESMTPS id 2CC116DE170E for\r
+ <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:04:55 -0800 (PST)\r
+Received: by wmnn186 with SMTP id n186so60910668wmn.1\r
+ for <notmuch@notmuchmail.org>; Sat, 07 Nov 2015 03:04:53 -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:in-reply-to:references;\r
+ bh=3y7zFNfOMVRgGPwSbevgO8BJ5NGj7loC6K7g8sSjHvk=;\r
+ b=LABkj75eUmjTN2K5FnXOxjwXvWlyNkfJ2oy36WGtTV/8O0Kd6o30/X/4s7AKeb2kj7\r
+ f9xTzB/axmvnKSLaojsNR58h8aHPqjqb4PhkVW/m2wflV/GQbnjZF7XpLs0HPamKKojr\r
+ Eg3FyKf0Zh3/T67bJPBNFsX9RnaV58aUf2KH4Lclxqg/iNPCyff1B93Eu2H2t0diadkT\r
+ Kh608wXLD0zIUi+NCdsb4jsSKCXQb6a12JmUvVxi1bTz1bFywtX4u12sHolfXXBRereY\r
+ UHCjnHdFEm26UEX5qVclvr6Oq3iR3Bu3qobD70mJnKGVT4ZsUBUBrDxd8ZI/Tm9SvIyW\r
+ vsJQ==\r
+X-Received: by 10.28.143.1 with SMTP id r1mr15972715wmd.80.1446894293740;\r
+ Sat, 07 Nov 2015 03:04:53 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id 186sm3443760wmp.10.2015.11.07.03.04.52\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 07 Nov 2015 03:04:52 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 6/7] emacs/mua: Let user specify which parts get a header\r
+ in citations.\r
+Date: Sat,  7 Nov 2015 11:04:35 +0000\r
+Message-Id: <1446894276-7814-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\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:05:07 -0000\r
+\r
+From: David Edmondson <dme@dme.org>\r
+\r
+Add a customizable function specifying which parts get a header when\r
+replying, and give some sensible possiblities. These are,\r
+\r
+1) all parts except multipart/*. (Subparts of a multipart part do\r
+receive a header button.)\r
+\r
+2) only included text/* parts.\r
+\r
+3) Exactly as in the show buffer.\r
+\r
+4) None at all. This means the reply contains a mish-mash of all the\r
+original message's parts.\r
+---\r
+ emacs/notmuch-mua.el  | 30 ++++++++++++++++++++++++++----\r
+ emacs/notmuch-show.el | 13 +++++++++++++\r
+ 2 files changed, 39 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 2f7abb0..a675f47 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -91,6 +91,23 @@ (defcustom notmuch-mua-cite-function 'message-cite-original\r
+   :link '(custom-manual "(message)Insertion Variables")\r
+   :group 'notmuch-reply)\r
+ \r
++(defcustom notmuch-mua-reply-insert-header-p-function\r
++  'notmuch-show-reply-insert-header-p-trimmed\r
++  "Function to decide which parts get a header when replying.\r
++\r
++This function specifies which parts of a mime message with\r
++mutiple parts get a header."\r
++  :type '(radio (const :tag "All except multipart/* and hidden parts"\r
++                             notmuch-show-reply-insert-header-p-trimmed)\r
++              (const :tag "Only for included text parts"\r
++                             notmuch-show-reply-insert-header-p-minimal)\r
++              (const :tag "Exactly as in show view"\r
++                             notmuch-show-insert-header-p)\r
++              (const :tag "No part headers"\r
++                             notmuch-show-reply-insert-header-p-never)\r
++              (function :tag "Other"))\r
++  :group 'notmuch-reply)\r
++\r
+ ;;\r
+ \r
+ (defun notmuch-mua-get-switch-function ()\r
+@@ -221,10 +238,15 @@ (defun notmuch-mua-reply (query-string &optional sender reply-all)\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 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-body original (plist-get original :body) 0)\r
+                   (buffer-substring-no-properties (point-min) (point-max)))))\r
+ \r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index f4a65cc..7ff9ed5 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -959,6 +959,19 @@ (defun notmuch-show-insert-header-p (part hide)\r
+     (not (and (string= mime-type "text/plain")\r
+             (<= (plist-get part :id) 1)))))\r
+ \r
++(defun notmuch-show-reply-insert-header-p-never (part hide)\r
++  nil)\r
++\r
++(defun notmuch-show-reply-insert-header-p-trimmed (part hide)\r
++  (let ((mime-type (notmuch-show-mime-type part)))\r
++    (and (not (notmuch-match-content-type mime-type "multipart/*"))\r
++       (not hide))))\r
++\r
++(defun notmuch-show-reply-insert-header-p-minimal (part hide)\r
++  (let ((mime-type (notmuch-show-mime-type part)))\r
++    (and (notmuch-match-content-type mime-type "text/*")\r
++       (not hide))))\r
++\r
+ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+   "Insert the body part PART at depth DEPTH in the current thread.\r
+ \r
+-- \r
+2.1.4\r
+\r