From 8406d9af0cd70bcc1f4b5dfdc4794d8c47c0a22f Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 7 Nov 2015 11:04:32 +0000 Subject: [PATCH] [PATCH v4 3/7] emacs/mua: Generate improved cited text for replies --- e7/222b4fc45a6b8def96cb864cfef53731a92aca | 136 ++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 e7/222b4fc45a6b8def96cb864cfef53731a92aca diff --git a/e7/222b4fc45a6b8def96cb864cfef53731a92aca b/e7/222b4fc45a6b8def96cb864cfef53731a92aca new file mode 100644 index 000000000..4cf8aeaa3 --- /dev/null +++ b/e7/222b4fc45a6b8def96cb864cfef53731a92aca @@ -0,0 +1,136 @@ +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 9CD396DE190D + for ; Sat, 7 Nov 2015 03:05:04 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.144 +X-Spam-Level: +X-Spam-Status: No, score=-0.144 tagged_above=-999 required=5 tests=[AWL=0.426, + 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 UMwS1ysf_CEB for ; + Sat, 7 Nov 2015 03:05:03 -0800 (PST) +Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com + [209.85.212.175]) + by arlo.cworth.org (Postfix) with ESMTPS id 870296DE17F0 + for ; Sat, 7 Nov 2015 03:04:49 -0800 (PST) +Received: by wikq8 with SMTP id q8so43978010wik.1 + for ; Sat, 07 Nov 2015 03:04:48 -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=9zeN5Lphq6tFQ9hVHbOwj2veV6Tf/oOYVL3aW9d7yXk=; + b=mlFUlcHG55NVaY5S0hqwJgQOcx/VlrX0aZxAajbmyNFjb8cVvTjNIohaViNHuEYgoU + GyXknLClggGlP1Z8EVL82KDSWMPNvYyyjrCOfVIuAdV5dfcad/xt6rnq1GYLW06skkfc + ufFTgo0JKWAMVsvKgUXJ8l2lDuJXtZwUHHwoiLPMQiNVyOP9TJt8GZgEp8tdfAJ7RVt4 + f7PrQwasD4V4MAsOU5Fou7myiAKMZzKhwtE0+CeAM35CPz2kugludz8vx9tfUFysXbLo + 8z2gL3RX7N5CDlzKRCBgOpxZdKAbElxxDO/uwcO0f8sWKZbZV93ZS88uqc96xU/FKcIY + zD9A== +X-Received: by 10.194.7.69 with SMTP id h5mr19687356wja.117.1446894288122; + Sat, 07 Nov 2015 03:04:48 -0800 (PST) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by smtp.gmail.com with ESMTPSA id kr10sm4555351wjc.25.2015.11.07.03.04.46 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 07 Nov 2015 03:04:47 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v4 3/7] emacs/mua: Generate improved cited text for replies +Date: Sat, 7 Nov 2015 11:04:32 +0000 +Message-Id: <1446894276-7814-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com> +References: <1446894276-7814-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: Sat, 07 Nov 2015 11:05:04 -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 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