From a450877d50d125f30876b9a8d53ea2238dc659bf Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 14 Feb 2016 18:39:55 +0000 Subject: [PATCH] [PATCH v5 3/7] emacs/mua: Generate improved cited text for replies --- 9c/94653253e0437a6b90ac2e18f52d5fa77f1c1f | 148 ++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 9c/94653253e0437a6b90ac2e18f52d5fa77f1c1f diff --git a/9c/94653253e0437a6b90ac2e18f52d5fa77f1c1f b/9c/94653253e0437a6b90ac2e18f52d5fa77f1c1f new file mode 100644 index 000000000..c689239bf --- /dev/null +++ b/9c/94653253e0437a6b90ac2e18f52d5fa77f1c1f @@ -0,0 +1,148 @@ +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 74E046DE1AC9 + for ; Sun, 14 Feb 2016 10:40:25 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.246 +X-Spam-Level: +X-Spam-Status: No, score=-0.246 tagged_above=-999 required=5 tests=[AWL=0.324, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-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 fKeVQVrWHz6d for ; + Sun, 14 Feb 2016 10:40:23 -0800 (PST) +Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com + [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id D7BC46DE1A2F for + ; Sun, 14 Feb 2016 10:40:19 -0800 (PST) +Received: by mail-wm0-f66.google.com with SMTP id b205so4795550wmb.1 + for ; Sun, 14 Feb 2016 10:40:19 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=SLPZtgUXjVnynhWVP1tT8bXXJa+S2YrOZeXC6uMpJBU=; + b=yXX4ChvnYs/EoVFa12gVObwBMABh0wWGPkXDQRBBRc0hPkRSzR+GPVex9Yap8X3DjP + mSQ6rz61dzeWdxZvtRaeFLPQKTfOGz6fKPUe6fLEbPjIh+hKkmcheoxImDck+LE5axF9 + rf9Bd/tSFpO5ruTDNc4PplKJuA+p6vqy76r1UVr8dZ9epcHsNh1yDcLuIdZZ2UINBiPH + 4xiZA4BTkjXNMoAXrH6dOSNvgzNbDiiJklHRYjNXoAdsMVuo7Jjn0MgEVP+3J0ydOH+V + YPPqYyDwbHxlBijbAtRSsU2EhBnUPBVZO1mFVUVZeojjPGaqDKiDdO32eDgmky49crX6 + GUHw== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references; + bh=SLPZtgUXjVnynhWVP1tT8bXXJa+S2YrOZeXC6uMpJBU=; + b=CmkIjwwR76/Rv01bZ8FL6fRla9CLKSHvyCpo3hogQoIHLZ5lIDHUw/68h5N2sh6/iD + fzqtmOxCkCFCBa2OFrbBivn0gNzxG1GwG0BSdogz4EjFHsd6l2DqT+ElZ0lIdXYdYVN3 + qtHUM9xEQhNsO79KpGKP+C2IqfQgf5WVZ0BMwu4WgIql/1sj/oirucNSL49jGxsJ2J5P + 5tY9NOGqU1Nd1eJVf8qne61/K8Dc/PhC+gdfkQZosS6Xy7ePm9h0dEffNbbkMSom1ilm + yPn/XiOyif0SPQ5YQyFYwfPfBjfmdOHBqqB3jk6VNKA3dv1mHAbyC1CH1nblSUWNNuEk + Bcig== +X-Gm-Message-State: + AG10YORQEKkqz1ll6yfksjXSPKh27ah0aW9E70M0nKqsEL8O7wcapRsYqx/144XCiZhtJw== +X-Received: by 10.195.12.113 with SMTP id ep17mr11795496wjd.102.1455475218586; + Sun, 14 Feb 2016 10:40:18 -0800 (PST) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by smtp.gmail.com with ESMTPSA id e77sm12107568wma.18.2016.02.14.10.40.17 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sun, 14 Feb 2016 10:40:18 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v5 3/7] emacs/mua: Generate improved cited text for replies +Date: Sun, 14 Feb 2016 18:39:55 +0000 +Message-Id: <1455475199-32622-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com> +References: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com> +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: Sun, 14 Feb 2016 18:40:25 -0000 + +From: David Edmondson + +Use the message display code to generate message text to cite in +replies. +--- + 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 d4fad7b..a386d43 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)) + (declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ()) + (declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir)) + +@@ -144,31 +144,6 @@ Note that these functions use `mail-citation-hook' if that is non-nil." + 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, +@@ -247,10 +222,13 @@ Note that these functions use `mail-citation-hook' if that is non-nil." + (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