Re: [PATCH v4 6/7] emacs/mua: Let user specify which parts get a header in citations.
authorMark Walters <markwalters1009@gmail.com>
Tue, 9 Feb 2016 22:35:58 +0000 (22:35 +0000)
committerW. Trevor King <wking@tremily.us>
Sat, 20 Aug 2016 23:21:03 +0000 (16:21 -0700)
91/a76f9941dff1217c0914acf56ac78285667c65 [new file with mode: 0644]

diff --git a/91/a76f9941dff1217c0914acf56ac78285667c65 b/91/a76f9941dff1217c0914acf56ac78285667c65
new file mode 100644 (file)
index 0000000..77101d5
--- /dev/null
@@ -0,0 +1,192 @@
+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 E71986DE0231\r
+ for <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 14:36:03 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.225\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.225 tagged_above=-999 required=5 tests=[AWL=0.345,\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 vWpkkzGE-gZf for <notmuch@notmuchmail.org>;\r
+ Tue,  9 Feb 2016 14:36:01 -0800 (PST)\r
+Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com\r
+ [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 75B176DE01D3 for\r
+ <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 14:36:01 -0800 (PST)\r
+Received: by mail-wm0-f66.google.com with SMTP id c200so528109wme.0\r
+ for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 14:36:01 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version:content-type;\r
+ bh=UPVD4E22bC6pyZoFr8O6/msntaRyc7QfhOtp2vcDk1k=;\r
+ b=rCPsD94mYuJAVzpJaBkVEdT/JHHEK1YEjazVFgRtiWg7hIOAlPgtcNOhm5MvgeAiIr\r
+ lBkVYRZY0/luKFq4YeF4Z9x3+qn+GUREWxI81pwhDwH+/Kx1WHJdoAalUSn8QIHfZh+R\r
+ OpdBgTXv7kzaM7C8DW8n6CLEwVhD69otN7NAgndYEnM3oA9D03TBivnD+szCV1aceQc4\r
+ A5SZhyeAlZfasadqd19U+uLLcvkvJv4A3x1ZvlLaLi8IWWgBTlusb0iQCc9S4Vffzf6z\r
+ qZXl9K2I30XiUyQJ9rqnCrQHnYl5jbYdpFhvjkffd5d7QQ8yGwGiKMlvvEgzADQUKeJS\r
+ 8+ag==\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:content-type;\r
+ bh=UPVD4E22bC6pyZoFr8O6/msntaRyc7QfhOtp2vcDk1k=;\r
+ b=bRE/EeGqy2BdVhdWk+XFBPdLdxYAvHhoGDyUq2xroPLXRvTGxZjHZTo22F6Yf2J15t\r
+ Gx7RBeGUE14mGIGBe2pVXafIFtgv2UooDuVSTShnv9JchtMQWRKcK+RCSmdO2Ny6OHBZ\r
+ 6KWUkpZFs5PVJRULP1pzTEJ4aVo2awyuDc57n2eJjw2013yJnvjLJWdHUslCH2ZztsJr\r
+ ZitiCFhfGO8VISUNB5fgvt8OH0l7hDZ5BiZKwal5LhKlhdNwiQUkFzfHrXpsAF967LRe\r
+ HL1Ot0HN2dErfAm8qaXesokMJxmIsgBQMnc824UviwS1c+BHK9N7Hq6XWgfLRQaJI8JJ\r
+ m2jg==\r
+X-Gm-Message-State:\r
+ AG10YOSARhJUkNsQ/lYpBg8xAbMJDxk8pMenJagcE8OZTUddv9PlOAOtXqe9hPNA0fkOkA==\r
+X-Received: by 10.28.184.137 with SMTP id i131mr7014886wmf.96.1455057360115;\r
+ Tue, 09 Feb 2016 14:36:00 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id uo9sm126876wjc.49.2016.02.09.14.35.59\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 09 Feb 2016 14:35:59 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v4 6/7] emacs/mua: Let user specify which parts get a\r
+ header in citations.\r
+In-Reply-To: <m2ziv939o7.fsf@dme.org>\r
+References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+ <1446894276-7814-7-git-send-email-markwalters1009@gmail.com>\r
+ <m2ziv939o7.fsf@dme.org>\r
+User-Agent: Notmuch/0.18.1+485~gca076ce (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 09 Feb 2016 22:35:58 +0000\r
+Message-ID: <87twlh5x69.fsf@qmul.ac.uk>\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: Tue, 09 Feb 2016 22:36:04 -0000\r
+\r
+\r
+On Tue, 09 Feb 2016, David Edmondson <dme@dme.org> wrote:\r
+> On Sat, Nov 07 2015, Mark Walters wrote:\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
+> These are all functions - should we be `declare-function'ing them, given\r
+> that they come from elsewhere? Presumably the compiler is not clever\r
+> enough to complain if we don't.\r
+\r
+Hi,\r
+\r
+The compiler doesn't seem to complain. But I don't know if we should\r
+have the declare functions anyway? Any thoughts?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\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