From e0de5d5b58b9b98a49cfe68045e90d80313153ef Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Mon, 12 May 2014 13:29:24 +0100 Subject: [PATCH] [PATCH v3 4/9] emacs/mua: Generate improved cited text for replies --- 6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf | 141 ++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf diff --git a/6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf b/6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf new file mode 100644 index 000000000..d55160a22 --- /dev/null +++ b/6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf @@ -0,0 +1,141 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 6E689431FC7 + for ; Mon, 12 May 2014 05:29:38 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 2SbHk87qUGlj for ; + Mon, 12 May 2014 05:29:33 -0700 (PDT) +Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com + [74.125.82.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + B6FB4431FC2 for ; Mon, 12 May 2014 05:29:32 -0700 + (PDT) +Received: by mail-wg0-f42.google.com with SMTP id y10so6620213wgg.13 + for ; Mon, 12 May 2014 05:29:31 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to + :references; + bh=k7lGn+r3PVEj5mpRiYdGS0/uH6KAbWHS3chP1tmr6Vw=; + b=QQpoJBF40LNRJ2QS+o0/1Ug+ALUBWEkxVPhcwuQUnvQ4UVljnGQNHtkZeZa+QpIAu0 + gNmAkyAOtLjVUL1rkcrvQtbJ9J4GV3HRic/raWb8ARjF+wJZH3z7PRwf9JjTD5PD/r+i + agKkCGQ6AzlwHPNSyY2/dekoHge7eC/WHx87/UEH1vJxsajMzcBWR+xWZ9iizChLqDfn + +Aec+WRP/dkpawmPyN5C1qqPX38XIWQboe3BY2YD4XjTB+LRIsrFOu+JfruaEQ45ssem + pZygDVdT3ov1ZOYJHQzOjlLuoaUmfKRAHPchpxHV+R3mAerecBdRhOMNUV/xKG32Elo0 + y6LQ== +X-Gm-Message-State: + ALoCoQnr+eaKInQwXKlzlVRr76S6c2Cc0nxZlQcjTdz+y/NGYao2haDwpkwngsU4HmhGFT+uzoTf +X-Received: by 10.180.88.129 with SMTP id bg1mr15477163wib.51.1399897771348; + Mon, 12 May 2014 05:29:31 -0700 (PDT) +Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net. + [81.149.164.25]) + by mx.google.com with ESMTPSA id d6sm15890108wiz.4.2014.05.12.05.29.29 + for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 12 May 2014 05:29:30 -0700 (PDT) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 3F37210B328; Mon, 12 May 2014 13:29:29 +0100 (BST) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v3 4/9] emacs/mua: Generate improved cited text for replies +Date: Mon, 12 May 2014 13:29:24 +0100 +Message-Id: <1399897769-26809-5-git-send-email-dme@dme.org> +X-Mailer: git-send-email 2.0.0.rc0 +In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org> +References: <87sixdujkv.fsf@qmul.ac.uk> + <1399897769-26809-1-git-send-email-dme@dme.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Mon, 12 May 2014 12:29:38 -0000 + +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 95e4a4d..09c922f 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)) + + ;; + +@@ -123,31 +123,6 @@ list." + 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, +@@ -225,10 +200,13 @@ list." + (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.0.0.rc0 + -- 2.26.2