From 1e59c501ab8dd02c8ea4ca4ade9b619ab409c6b3 Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Tue, 9 Feb 2016 20:30:41 +0000 Subject: [PATCH] Re: [PATCH v4 3/7] emacs/mua: Generate improved cited text for replies --- ed/32e283f33dcef7fedf13ba8cd97a877a921083 | 159 ++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 ed/32e283f33dcef7fedf13ba8cd97a877a921083 diff --git a/ed/32e283f33dcef7fedf13ba8cd97a877a921083 b/ed/32e283f33dcef7fedf13ba8cd97a877a921083 new file mode 100644 index 000000000..903f10738 --- /dev/null +++ b/ed/32e283f33dcef7fedf13ba8cd97a877a921083 @@ -0,0 +1,159 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 3EFE26DE1603 + for ; Tue, 9 Feb 2016 12:30:47 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.079 +X-Spam-Level: +X-Spam-Status: No, score=-0.079 tagged_above=-999 required=5 + tests=[AWL=-0.012, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, + RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, + RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id QE3BvZoopd_J for ; + Tue, 9 Feb 2016 12:30:45 -0800 (PST) +Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com + [74.125.82.68]) by arlo.cworth.org (Postfix) with ESMTPS id F36576DE1635 for + ; Tue, 9 Feb 2016 12:30:44 -0800 (PST) +Received: by mail-wm0-f68.google.com with SMTP id p63so52168wmp.1 + for ; Tue, 09 Feb 2016 12:30:44 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=dme-org.20150623.gappssmtp.com; s=20150623; + h=to:subject:in-reply-to:references:from:date:message-id:mime-version + :content-type; bh=5pMxtykuU3wo7nHcvCZlorG2pXhcoN5OHbWw8ZXafZw=; + b=ZQsIG9hBnmsX20j3nxmcZUGUshh7C4hmwLRpCmC+UVD903l4Y6XRn9s44/Ybm5mdYV + acSPwj1E6/1cww5UXsSIURfW4XOd6WsLs2S6LqQ2njipT7RLQ3CWpszEp+3931ZqZGG/ + JwGKC201bN8oD0+m/L8oXQkgORPUQgpXFfeys0FaMzS2yMynhW1QzwOFBpIsPoNRjmSg + SI12POMcnFBBgttmX3A5m3TvDRNC8XCnHDw9566LMSK1BHowJP/PGDD4cCl/r4zRazTX + 1U49Nwv2tJc4+5MUJMaEgW79scXFE/FN5WPMIcxERMW1inSl5OwlYU7fz7rH0t8bZFJS + 0WVA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:to:subject:in-reply-to:references:from:date + :message-id:mime-version:content-type; + bh=5pMxtykuU3wo7nHcvCZlorG2pXhcoN5OHbWw8ZXafZw=; + b=FW1q3rOw3GWSsrrrZcaIM9OwDkUIOYJZIBfWzpn//u3JPNOl6yhL/oMJw7Q+RL1Xll + dC1nIwfMd+k3eRQ9y7LeWiTm6btMNQYVgQZJl8/oI/CakyPcql2dWaHg8NrNcj77R+uW + YmsAOajlDcR7SUpF7n0w/xd6klLSt1Ye5o/IiuQo1LZJ9KCTZ7g3eXp1NS3nt+CT5xh3 + WZTdj/4r9kjaYIDlOppKCSqzm5EtIVqlh2qV5FX1Zv+lnmWX5mOJCrC2WYuuxAwhIm5G + 1MyBln7/u5AlsRio7s3SkSmzVgfLT4ZFFIVz0NyOuHWdbja2X7+jgAw4s78DsdWtz5ym + XRAw== +X-Gm-Message-State: + AG10YOTDHkuEmKi1pzk8ICfkz7/3yGqYl+J2zHI9s4ZT2XYJ94Jj6YnvLJZY332S7pRoqA== +X-Received: by 10.194.112.41 with SMTP id in9mr35652468wjb.139.1455049843588; + Tue, 09 Feb 2016 12:30:43 -0800 (PST) +Received: from disaster-area.hh.sledj.net + ([2a01:348:1a2:1:ea39:35ff:fe2c:a227]) + by smtp.gmail.com with ESMTPSA id r62sm245796wmd.15.2016.02.09.12.30.41 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Tue, 09 Feb 2016 12:30:42 -0800 (PST) +Received: from localhost (disaster-area.hh.sledj.net [local]) + by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 91c0c906; + Tue, 9 Feb 2016 20:30:41 +0000 (UTC) +To: Mark Walters , notmuch@notmuchmail.org +Subject: Re: [PATCH v4 3/7] emacs/mua: Generate improved cited text for + replies +In-Reply-To: <1446894276-7814-4-git-send-email-markwalters1009@gmail.com> +References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com> + <1446894276-7814-4-git-send-email-markwalters1009@gmail.com> +From: David Edmondson +Date: Tue, 09 Feb 2016 20:30:41 +0000 +Message-ID: +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 09 Feb 2016 20:30:47 -0000 + +On Sat, Nov 07 2015, Mark Walters wrote: +> From: David Edmondson +> +> Use the message display code to generate message text to cite in +> replies. + +Looks fine. + +> --- +> emacs/notmuch-mua.el | 38 ++++++++------------------------------ +> 1 file changed, 8 insertions(+), 30 deletions(-) +> +> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +> index fd98ea4..2f7abb0 100644 +> --- a/emacs/notmuch-mua.el +> +++ b/emacs/notmuch-mua.el +> @@ -28,7 +28,7 @@ +> +> (eval-when-compile (require 'cl)) +> +> -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide)) +> +(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth)) +> +> ;; +> +> @@ -142,31 +142,6 @@ (defun notmuch-mua-reply-crypto (parts) +> else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*") +> do (notmuch-mua-reply-crypto (plist-get part :content)))) +> +> -(defun notmuch-mua-get-quotable-parts (parts) +> - (loop for part in parts +> - if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative") +> - collect (let* ((subparts (plist-get part :content)) +> - (types (mapcar (lambda (part) (plist-get part :content-type)) subparts)) +> - (chosen-type (car (notmuch-multipart/alternative-choose types)))) +> - (loop for part in (reverse subparts) +> - if (notmuch-match-content-type (plist-get part :content-type) chosen-type) +> - return part)) +> - else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*") +> - append (notmuch-mua-get-quotable-parts (plist-get part :content)) +> - else if (notmuch-match-content-type (plist-get part :content-type) "text/*") +> - collect part)) +> - +> -(defun notmuch-mua-insert-quotable-part (message part) +> - ;; We don't want text properties leaking from the show renderer into +> - ;; the reply so we use a temp buffer. Also we don't want hooks, such +> - ;; as notmuch-wash-*, to be run on the quotable part so we set +> - ;; notmuch-show-insert-text/plain-hook to nil. +> - (insert (with-temp-buffer +> - (let ((notmuch-show-insert-text/plain-hook nil)) +> - ;; Show the part but do not add buttons. +> - (notmuch-show-insert-bodypart message part 0 'no-buttons)) +> - (buffer-substring-no-properties (point-min) (point-max))))) +> - +> ;; There is a bug in emacs 23's message.el that results in a newline +> ;; not being inserted after the References header, so the next header +> ;; is concatenated to the end of it. This function fixes the problem, +> @@ -245,10 +220,13 @@ (defun notmuch-mua-reply (query-string &optional sender reply-all) +> (insert "From: " from "\n") +> (insert "Date: " date "\n\n") +> +> - ;; Get the parts of the original message that should be quoted; this includes +> - ;; all the text parts, except the non-preferred ones in a multipart/alternative. +> - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body)))) +> - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts)) +> + (insert (with-temp-buffer +> + ;; Don't attempt to clean up messages, excerpt +> + ;; citations, etc. in the original message before +> + ;; quoting. +> + (let ((notmuch-show-insert-text/plain-hook nil)) +> + (notmuch-show-insert-body original (plist-get original :body) 0) +> + (buffer-substring-no-properties (point-min) (point-max))))) +> +> (set-mark (point)) +> (goto-char start) +> -- +> 2.1.4 -- 2.26.2