--- /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 00BDB6DE177E\r
+ for <notmuch@notmuchmail.org>; Mon, 7 Mar 2016 11:17:09 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.554\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.554 tagged_above=-999 required=5 tests=[AWL=0.166,\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 OuRxEZclb3m7 for <notmuch@notmuchmail.org>;\r
+ Mon, 7 Mar 2016 11:17:06 -0800 (PST)\r
+Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
+ [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 257936DE176A for\r
+ <notmuch@notmuchmail.org>; Mon, 7 Mar 2016 11:17:06 -0800 (PST)\r
+Received: by mail-wm0-f67.google.com with SMTP id 1so12481338wmg.2\r
+ for <notmuch@notmuchmail.org>; Mon, 07 Mar 2016 11:17: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=cpR0y2ylHbM8t5j3BxKw/RNL/Iq1ZQTyeKZ8GmGR4cg=;\r
+ b=0+Yx1nlRVU5gZ5qHXAnmDW7nEgS0qJgKSVDTNuaVm0/Iqip17ADVvqkMNYO77px1Bm\r
+ CprONktmXXpCkD3qXJpLj68xpN0nWqgyxB0R/OzmyDnHYaWDX+GcnudHH91L6wcb4owR\r
+ f/bMeEgGAXOiy0Bs7gfOLMjUe0G9BLxLxDkJqBK5/6QlYi+qqgCWY91xuHcBpms5Z27q\r
+ ye8xiHbTBD+cATLV/KUMcCOM+Kbef8MYJeJTES+r/5D76+2CuNAn2NbeMhkAwwATU2OR\r
+ tiQavnk9k+580ZQto0ijvlnx+5M7W2b/PNzT695ZTWA36ZEnxd+Wu08Y+mAxVgwa+cy2\r
+ IjiA==\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=cpR0y2ylHbM8t5j3BxKw/RNL/Iq1ZQTyeKZ8GmGR4cg=;\r
+ b=WY3JWC02KvmRq1/utS5US9bqn8CKiv+sOhLEQFsJ0ZJlFotUYOeychLoiAfq2uYmuY\r
+ FvGQ9hriks6zN8n07ZoQ7fNhJAnGtUkmBZW/Wzt0IdGx/3fkIxtB5VhbJTRw5TFeheWi\r
+ ZlPr4DR/nh5/L5tECN3f5W5uORriW5/bNO/uzPdo0bX+8cui2HEf+36x6WwGIWdx+0IG\r
+ mvawfa3XRglPoJucUaf3svWMZuq4QkL4ydjTX5IFMRMXVsC+XnMb3hSzVqNKVX0wwtjH\r
+ t0EANEAPnc7pHiE5FKg6KzPki6obqs0C3+QUe2VUtQiLkaAaLI2vecRpaGy4nUwvzCh3\r
+ NKWQ==\r
+X-Gm-Message-State:\r
+ AD7BkJLHlF3jRJb0nIy0tr19MHTOQCjeebAub8GpSYU+UB7PYcARZ9YAAtfzJguNs9wGFg==\r
+X-Received: by 10.194.191.199 with SMTP id ha7mr24602900wjc.128.1457378224891;\r
+ Mon, 07 Mar 2016 11:17:04 -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 gk4sm19399733wjd.7.2016.03.07.11.17.03\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 07 Mar 2016 11:17:03 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: David Edmondson <dme@dme.org>, Mark Walters <markwalters1009@gmail.com>,\r
+ 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: <m2a8maurj5.fsf@dme.org>\r
+References: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>\r
+ <1455992680-24978-7-git-send-email-markwalters1009@gmail.com>\r
+ <87y49uqkc3.fsf@nikula.org> <m2a8maurj5.fsf@dme.org>\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 21:16:01 +0200\r
+Message-ID: <8760wy5cb2.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 19:17:09 -0000\r
+\r
+On Mon, 07 Mar 2016, David Edmondson <dme@dme.org> wrote:\r
+> On Mon, Mar 07 2016, Jani Nikula wrote:\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
+> We definitely argued about it ages ago (and Mark pointed out as much in\r
+> his introduction to the patch series), but I don't remember which\r
+> position I took then :-)\r
+>\r
+> Seeing it now, I suspect that `notmuch-show-insert-header-p' is a better\r
+> default.\r
+\r
+I'm not sure. Replying to a message with multipart/alternative and\r
+hidden parts and attachments leads to quite a mess, to be honest (which,\r
+I presume, is the reason for the current default).\r
+\r
+I'll set it to no part headers, but I might find an option to insert\r
+part headers for parts with "content-disposition: attachment"\r
+interesting. Either that, or the current default plus no headers for\r
+single part messages.\r
+\r
+BR,\r
+Jani.\r
+\r
+\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
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> https://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff