--- /dev/null
+Return-Path: <jani@nikula.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 637636DE0C5F\r
+ for <notmuch@notmuchmail.org>; Mon, 7 Mar 2016 09:18:13 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.55\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.55 tagged_above=-999 required=5 tests=[AWL=0.170, \r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] 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 jrmEbRjBUylY for <notmuch@notmuchmail.org>;\r
+ Mon, 7 Mar 2016 09:18:07 -0800 (PST)\r
+Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com\r
+ [74.125.82.52]) by arlo.cworth.org (Postfix) with ESMTPS id 844E86DE021D for\r
+ <notmuch@notmuchmail.org>; Mon, 7 Mar 2016 09:18:06 -0800 (PST)\r
+Received: by mail-wm0-f52.google.com with SMTP id p65so117353470wmp.1\r
+ for <notmuch@notmuchmail.org>; Mon, 07 Mar 2016 09:18:06 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=nikula-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version; bh=LIUbFU5noZuXk5mCkx6GyWjTUt78Ri+c3y7DHFR4swo=;\r
+ b=Jxqp1MwAO9UmiSakFPj4uEHRWjUQlDzTLZWEDV/JSmHaHSfjIVwsFtYnzKwAwZbajh\r
+ lECpFdTvIqO7M1k+4QXMs1fyKlCAfOzqJvHYohV6WK4oOmhVr4ABQbcnA66nkMEOBUGG\r
+ G2va5xL5YEeTdotNoct6PzbIIvCWMPAVF6oRvGWz0P3K4WseU+tU0uGEX7n405Z3hM7/\r
+ kfYxAIb41b4safX2lNX2S0z7DxAt94vG6ayGqOmK5MZP1u7vlLTOcrwPg+BJu8EMNezu\r
+ rGSiG678A9a6aGk5wMNxQzNEoXY76qdCxUR5Egj3VQ18MRZ/ZpTRnGlVssIUiZQ0cbpi\r
+ XBsw==\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:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version;\r
+ bh=LIUbFU5noZuXk5mCkx6GyWjTUt78Ri+c3y7DHFR4swo=;\r
+ b=fDawC2binuxuJoh4Di6QUR91+fiA3hehJsKc2gwHgrdez+Kb4Bn6/dTA9CYR/BXEyq\r
+ eyMdgIxOT+DTfVymo9bz/MM6PXOWPXnKNsOhZXo2pXUkanrdlRQ1SRiISBN2NHw3Y4tV\r
+ OX66yhmqetMaCHJfSY8vOHI72e6R/rVhlgfjnTiAcjKTj0odHygCZxECT7dLOOOP2UzQ\r
+ CitfQatj5n4Vplqb6qW5Ff0ZfkUX9JkWqPmsTsoLB/wmrSF/Ao68ukWhaDX3xiy+xS5S\r
+ fW0LvlPhbLfX9Cmuh6xntAqZgrDpurOqajBopYLWvWL6UlauyE2+uCBz1EaUcqPXoV+B\r
+ Zb5w==\r
+X-Gm-Message-State:\r
+ AD7BkJKa4ylDgo95xBjFdp0cC2HQiUG5wDbySzFkvgvfIkFwpu5qQIodRHQWWoaySOFKDA==\r
+X-Received: by 10.28.221.9 with SMTP id u9mr9024627wmg.92.1457371083772;\r
+ Mon, 07 Mar 2016 09:18:03 -0800 (PST)\r
+Received: from localhost (mobile-access-bcee39-255.dhcp.inet.fi.\r
+ [188.238.57.255])\r
+ by smtp.gmail.com with ESMTPSA id hx10sm18875182wjb.25.2016.03.07.09.18.02\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 07 Mar 2016 09:18:02 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v6 6/6] emacs/mua: Let user specify which parts get a\r
+ header in citations.\r
+In-Reply-To: <1455992680-24978-7-git-send-email-markwalters1009@gmail.com>\r
+References: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+ <1455992680-24978-7-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.21+73~gf8cc320 (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 07 Mar 2016 19:17:00 +0200\r
+Message-ID: <87y49uqkc3.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Mon, 07 Mar 2016 17:18:13 -0000\r
+\r
+On Sat, 20 Feb 2016, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> [ text/plain ]\r
+\r
+This patch (or, bisected commit d27d90875dfb emacs/mua: Let user specify\r
+which parts get a header in citations.) causes the above to be added to\r
+all replies. Why?\r
+\r
+I don't understand what "header" the patch is talking about. If it's the\r
+[ text/plain ] above and it's intentional, *shudder*. Who would want\r
+that?\r
+\r
+BR,\r
+Jani.\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> https://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff