--- /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 olra.theworths.org (Postfix) with ESMTP id 1F93D431FBD\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:30:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 5AOvAhbf1rHh for <notmuch@notmuchmail.org>;\r
+ Mon, 12 May 2014 15:30:34 -0700 (PDT)\r
+Received: from mail-we0-f179.google.com (mail-we0-f179.google.com\r
+ [74.125.82.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id DBDD7431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:30:33 -0700 (PDT)\r
+Received: by mail-we0-f179.google.com with SMTP id q59so7424529wes.24\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 15:30:32 -0700 (PDT)\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=IAwrBxB0lehoNuzsY1r/2BYt05z4YErfjvibABCoivY=;\r
+ b=dltqxc9KAJfXInhsQXrYn4+kc9N59JgXGLzpXNDIIk33t7XwMYcxNti9+eJB612E9U\r
+ P7AaojkUhGcEqMeFrMgM+WuKU62U+z3RlDvEoNNalHSEvmFcWgN5COnnjFD/BW46yyMo\r
+ bktvYnHFmy4gECKDsp5gFqy/Y5xgjRW3XYwMM1FJGWqpFjjsCArBNoDfSSX4wXRFnD8t\r
+ iB26ge1lEAzTE4xWVeE012V/jsXboPKgTx8XYeOk0aLcmELxtRjgBZea4LfPRD4HgLGQ\r
+ 7XVmx/Z4LQIXAsS+XwxNzpTdXZ4LNiZIhcoqY688qj9lmKGWdYu7QomgKD2Alt9urZW7\r
+ jLqA==\r
+X-Received: by 10.180.92.103 with SMTP id cl7mr2870880wib.26.1399933832780;\r
+ Mon, 12 May 2014 15:30:32 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by mx.google.com with ESMTPSA id c12sm3550893wib.13.2014.05.12.15.30.31\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Mon, 12 May 2014 15:30:32 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 4/9] emacs/mua: Generate improved cited text for\r
+ replies\r
+In-Reply-To: <1399897769-26809-5-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+ <1399897769-26809-1-git-send-email-dme@dme.org>\r
+ <1399897769-26809-5-git-send-email-dme@dme.org>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 12 May 2014 23:30:29 +0100\r
+Message-ID: <87egzyk4u2.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 12 May 2014 22:30:42 -0000\r
+\r
+\r
+On Mon, 12 May 2014, David Edmondson <dme@dme.org> wrote:\r
+> Use the message display code to generate message text to cite in\r
+> replies.\r
+\r
+So this is the key change. I am trying to work out what the actual\r
+changes are here: in your commit message for the test update 7/9 you say\r
+that the old code only output the first part. My impression of the\r
+deleted code is that that is not the case (but I don't grok cl very\r
+well).\r
+\r
+I think the test change is because in show we do some content-type\r
+guessing of application/octet-stream which the below doesn't do.\r
+\r
+But we may also have some things with mm-inlined-types as mentioned in\r
+my earlier reply. Anyway if you can point out any other cases where it\r
+is changed that would be great.\r
+\r
+If you go for a function deciding which parts to include then it might\r
+be possible to have a midpoint where we are the same as before, and then\r
+tweak the function to get whatever behaviour we think is best. That\r
+might make it easy to see what is tidying/unification and what is\r
+enhancement.\r
+\r
+Incidentally, thank you for splitting this series so finely: I did find\r
+that made it a lot easier to review.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+> ---\r
+> emacs/notmuch-mua.el | 38 ++++++++------------------------------\r
+> 1 file changed, 8 insertions(+), 30 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+> index 95e4a4d..09c922f 100644\r
+> --- a/emacs/notmuch-mua.el\r
+> +++ b/emacs/notmuch-mua.el\r
+> @@ -28,7 +28,7 @@\r
+> \r
+> (eval-when-compile (require 'cl))\r
+> \r
+> -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
+> +(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))\r
+> \r
+> ;;\r
+> \r
+> @@ -123,31 +123,6 @@ list."\r
+> else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+> do (notmuch-mua-reply-crypto (plist-get part :content))))\r
+> \r
+> -(defun notmuch-mua-get-quotable-parts (parts)\r
+> - (loop for part in parts\r
+> - if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative")\r
+> - collect (let* ((subparts (plist-get part :content))\r
+> - (types (mapcar (lambda (part) (plist-get part :content-type)) subparts))\r
+> - (chosen-type (car (notmuch-multipart/alternative-choose types))))\r
+> - (loop for part in (reverse subparts)\r
+> - if (notmuch-match-content-type (plist-get part :content-type) chosen-type)\r
+> - return part))\r
+> - else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+> - append (notmuch-mua-get-quotable-parts (plist-get part :content))\r
+> - else if (notmuch-match-content-type (plist-get part :content-type) "text/*")\r
+> - collect part))\r
+> -\r
+> -(defun notmuch-mua-insert-quotable-part (message part)\r
+> - ;; We don't want text properties leaking from the show renderer into\r
+> - ;; the reply so we use a temp buffer. Also we don't want hooks, such\r
+> - ;; as notmuch-wash-*, to be run on the quotable part so we set\r
+> - ;; notmuch-show-insert-text/plain-hook to nil.\r
+> - (insert (with-temp-buffer\r
+> - (let ((notmuch-show-insert-text/plain-hook nil))\r
+> - ;; Show the part but do not add buttons.\r
+> - (notmuch-show-insert-bodypart message part 0 'no-buttons))\r
+> - (buffer-substring-no-properties (point-min) (point-max)))))\r
+> -\r
+> ;; There is a bug in emacs 23's message.el that results in a newline\r
+> ;; not being inserted after the References header, so the next header\r
+> ;; is concatenated to the end of it. This function fixes the problem,\r
+> @@ -225,10 +200,13 @@ list."\r
+> (insert "From: " from "\n")\r
+> (insert "Date: " date "\n\n")\r
+> \r
+> - ;; Get the parts of the original message that should be quoted; this includes\r
+> - ;; all the text parts, except the non-preferred ones in a multipart/alternative.\r
+> - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))\r
+> - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))\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
+> + (notmuch-show-insert-body original (plist-get original :body) 0)\r
+> + (buffer-substring-no-properties (point-min) (point-max)))))\r
+> \r
+> (set-mark (point))\r
+> (goto-char start)\r
+> -- \r
+> 2.0.0.rc0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff