--- /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 3CFD46DE186C\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:25:12 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.283\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.283 tagged_above=-999 required=5 tests=[AWL=0.287,\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 ltAAbA91NZsz for <notmuch@notmuchmail.org>;\r
+ Sat, 20 Feb 2016 10:25:10 -0800 (PST)\r
+Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com\r
+ [74.125.82.42]) by arlo.cworth.org (Postfix) with ESMTPS id 020776DE1870 for\r
+ <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:58 -0800 (PST)\r
+Received: by mail-wm0-f42.google.com with SMTP id g62so119130553wme.1\r
+ for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:57 -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=PuatqE2r1DYn8sGzmyv2nf6yNe13REoAKmYPDsoHUVA=;\r
+ b=MdCkUsAthsmG7hL+BufC49vmpt0IOasEbNM5YgNdQjfPPT1rA8iWZhH7w7ypCRPPY6\r
+ OGJzoee9QkCf8S3ZonkbSBtBZfVPyb6NSJnDC5aWAKcyrnIldHgCctLtq0KLPQCAQspQ\r
+ 6p4cjMlyHtdZonjNfNXDMs6n/8+n6WKwmqdZQp1HhCLtl2G1zSlM0HUNyPAU4GuXTg07\r
+ HChFNqD95JaQah2MLdISNQiSYUb7iuKjCGxc8u0eFKZ9MSEyI+/DkRVNC7bqMv3aInQF\r
+ TMBgWEj2+/8LjBo+Tm5vvxw4JQMz37o2SzOfox/zCIUnpNMBfwYOSmev82VHluUVm55i\r
+ bL/Q==\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=PuatqE2r1DYn8sGzmyv2nf6yNe13REoAKmYPDsoHUVA=;\r
+ b=lH8O4VF7pJ4/9qWpK6Aqw4n43iX94pJJLY+pz0q6zcUMNJTwPpdG2WtbqOFwD5lvKZ\r
+ 0Kg4HheczCUUOMGhlL+n0XQjpMmsa0/My8cMlm8oqUSPIYKC7Onk8/XIWHvT0X6lUsTJ\r
+ +L8TNsnAA/7wBolyX0OHccLg6Ee5PqAmw7is27OReuqupl4zdY7Ma7Mo6nkVIRoVVWoB\r
+ cgtZyxOvXTgmwHIFOcYlYWDlbjB2Svbav82SJTrMTtARb9807SdU7qqOA3v1JdaaHKBg\r
+ g3yPs9SdJXbaaCtUiFSbziIjN4XLTzPPTDL8Bf6mUDodf8ardKk5+WrFOBH9wwe5KDiN\r
+ b62Q==\r
+X-Gm-Message-State:\r
+ AG10YOSbkMmns0m5oR2YWVpq8H++IjPxKxPFlZKe6+9HKYEEkijaEH9Z/G6p0ltc+WiiiQ==\r
+X-Received: by 10.194.189.71 with SMTP id gg7mr19509578wjc.127.1455992696707; \r
+ Sat, 20 Feb 2016 10:24:56 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id s8sm16676143wje.35.2016.02.20.10.24.55\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 20 Feb 2016 10:24:56 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 6/6] emacs/mua: Let user specify which parts get a header\r
+ in citations.\r
+Date: Sat, 20 Feb 2016 18:24:40 +0000\r
+Message-Id: <1455992680-24978-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1455992680-24978-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, 20 Feb 2016 18:25:12 -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
+In the test suite we set the choice to option 4 to match the\r
+previous behaviour.\r
+---\r
+ emacs/notmuch-mua.el | 19 ++++++++++++++++++-\r
+ emacs/notmuch-show.el | 10 ++++++++++\r
+ test/test-lib.el | 4 ++++\r
+ 3 files changed, 32 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index ecc5bec..fcb3e95 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -93,6 +93,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
+@@ -231,7 +248,7 @@ (defun notmuch-mua-reply (query-string &optional sender reply-all)\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-show-reply-insert-header-p-never))\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 2a81ec1..371e62d 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -954,6 +954,16 @@ (defun notmuch-show-insert-header-p (part hide)\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
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 596a705..02e020c 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -184,6 +184,10 @@ (defmacro notmuch-test-progn (&rest body)\r
+ (setq notmuch-tag-deleted-formats\r
+ '((".*" nil)))\r
+ \r
++;; For historical reasonse we don't print part headers when replying\r
++;; in the tests suite\r
++(setq notmuch-mua-reply-insert-header-p-function 'notmuch-show-reply-insert-header-p-never)\r
++\r
+ ;; force a common html renderer, to avoid test variations between\r
+ ;; environments\r
+ \r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff