--- /dev/null
+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 A4B666DE1AE1\r
+ for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.247\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.247 tagged_above=-999 required=5 tests=[AWL=0.323,\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 BztGXDzIMMIZ for <notmuch@notmuchmail.org>;\r
+ Sun, 14 Feb 2016 10:40:26 -0800 (PST)\r
+Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com\r
+ [74.125.82.68]) by arlo.cworth.org (Postfix) with ESMTPS id 4E6446DE10C1 for\r
+ <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:24 -0800 (PST)\r
+Received: by mail-wm0-f68.google.com with SMTP id g62so12193406wme.2\r
+ for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:24 -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=gR4Pj1W0tfGTQleSCmGyahj2v5hHtQ3Nh6BbHawCCV0=;\r
+ b=yC/ltf/HbW4VQpa+DjPZzGuvKauw0LfUf0tTAexe0lTGmk5YfbrjFX29/CxyXe6zaq\r
+ 8aGuxCb8zQGo/IzQrzMvuJx/06iHSnrJ/IjYO5GfnjNsG2rr0PSW3rU/qkIM8spuLLGj\r
+ 9p2qCsrO0hRMJzcdULzETEkTqQcI6fuV2mjvIawV3jz0oKaLLsVCd40Iw5hRg81d9ueM\r
+ Boe/wy1w3bg0diIdBVHlsmxZdSJTbB54phIPHrqeYdCHFrru7xhxhQCqQDPgjVZ3ysHz\r
+ HqTXBdcb02xk11IfmrMyWNAeSRGUwMeRCpNBx5BFnOzTGpJLtIXZUhw5+kCRUsDnxHZ+\r
+ S8tA==\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:in-reply-to\r
+ :references;\r
+ bh=gR4Pj1W0tfGTQleSCmGyahj2v5hHtQ3Nh6BbHawCCV0=;\r
+ b=X14xEjzzHmkp/BWvgUrlP6sY5mX7t/GH6DBYmYibCd48sc2RqVMzxg+gH+SZFMnNGB\r
+ /IkeUErE3WjQwl8RnSMAkgH5AHdN3+JFTDUaVKx5HtowsCY9JLHBW8iZG1aVYlP2Pr34\r
+ 4acd+BpPsUsoxL9XtK5pSa99j8qoane7nnAf8bxYa89A8Zsu0pUdRZ9J9OW5sJo6fkAr\r
+ WyBZHcYHEqCsdfqnMHQuLDe/KcRY8JfU9tFb9GJUas7BAklYQ0c7jc/6chfqF4OnAHr6\r
+ uVmiLprOlntxAS6dvEp3CAI8yYZYAm1T+Z/Q/rtFlO8QTjY0w8iAT1Ip1spnWnRBzfbH\r
+ Ctpg==\r
+X-Gm-Message-State:\r
+ AG10YOT6d3U++MNY2ZLyY7bH1UU3cscTfoACu/k2B+FdnWRi6UsnbSPGNEd47p1HuuovTg==\r
+X-Received: by 10.28.0.86 with SMTP id 83mr9154703wma.63.1455475223066;\r
+ Sun, 14 Feb 2016 10:40:23 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id uo9sm21731546wjc.49.2016.02.14.10.40.22\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 14 Feb 2016 10:40:22 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 6/7] emacs/mua: Let user specify which parts get a header\r
+ in citations.\r
+Date: Sun, 14 Feb 2016 18:39:58 +0000\r
+Message-Id: <1455475199-32622-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1455475199-32622-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: Sun, 14 Feb 2016 18:40:28 -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 a386d43..fcb3e95 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -93,6 +93,23 @@ Note that these functions use `mail-citation-hook' if that is non-nil."\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
+@@ -223,10 +240,15 @@ Note that these functions use `mail-citation-hook' if that is non-nil."\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 5654d11..ec58cac 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -957,6 +957,19 @@ this part.")\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
projects / notmuch-archives.git / commitdiff