From 79c783ecc205b4e2e2865a5132bb4ae7e23bbe8e Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Wed, 7 May 2014 18:14:06 +0100 Subject: [PATCH] [RFC] [PATCH] emacs/notmuch-mua: Generate improved cited text for replies --- 2d/c2cc69f40db938f86ec8e822401cd8d025f084 | 147 ++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 2d/c2cc69f40db938f86ec8e822401cd8d025f084 diff --git a/2d/c2cc69f40db938f86ec8e822401cd8d025f084 b/2d/c2cc69f40db938f86ec8e822401cd8d025f084 new file mode 100644 index 000000000..890a7b82c --- /dev/null +++ b/2d/c2cc69f40db938f86ec8e822401cd8d025f084 @@ -0,0 +1,147 @@ +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 7D9BC431FAF + for ; Wed, 7 May 2014 10:14:16 -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 j8ns2fPvtHRO for ; + Wed, 7 May 2014 10:14:11 -0700 (PDT) +Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com + [74.125.82.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + C50EB431FAE for ; Wed, 7 May 2014 10:14:10 -0700 + (PDT) +Received: by mail-wg0-f46.google.com with SMTP id n12so1329235wgh.5 + for ; Wed, 07 May 2014 10:14:09 -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=3A5ST4yHGlWraKm1pwJXk60uFMS1rsVqWH4Y70LOIqA=; + b=V38I8hJ5RLK3zacuNZ94W2C5xuVa9KZM+VIOMr+TxgNkz11elTtxsPU7Omzx+JSrlK + LhPUeYhl3WTJ+7DBAIMsNCZYW5vlV+hVUVwdH+2Twc1bILls3ayt/KpoTphH7kIZMV+6 + FdX5CwZkxGe3Na5fzyvKJe8W/MtiYoIOcCpD7os1eiN2Qzifb8JJasg8M+eBXTsK1L6F + j4LXNolD5tBz192+jQmDKuaOMmUji4VGM0OR9AJNkhPhxrPohwvJPp68202nilY84+WL + TC1Va1iawuoSJRXsDbHDJW9s88xIY45V3kdPNxtFVmsTNk57mqNvkAPVhBsyOLtp+KT8 + CgaA== +X-Gm-Message-State: + ALoCoQnT5kXOJkDgibXVOQT4DgTJBVl61Lb0ynpen7qsSP3wIVNzpk+IkXXMZMZaS92gn/qqK+AZ +X-Received: by 10.180.89.241 with SMTP id br17mr8894899wib.0.1399482849271; + Wed, 07 May 2014 10:14:09 -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 n5sm32835096wiz.1.2014.05.07.10.14.07 + for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Wed, 07 May 2014 10:14:08 -0700 (PDT) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id B7D51108AA8; Wed, 7 May 2014 18:14:06 +0100 (BST) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [RFC] [PATCH] emacs/notmuch-mua: Generate improved cited text for + replies +Date: Wed, 7 May 2014 18:14:06 +0100 +Message-Id: <1399482846-25308-1-git-send-email-dme@dme.org> +X-Mailer: git-send-email 2.0.0.rc0 +In-Reply-To: <87sixdujkv.fsf@qmul.ac.uk> +References: <87sixdujkv.fsf@qmul.ac.uk> +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: Wed, 07 May 2014 17:14:16 -0000 + +Use the message display code to generate message text to cite in +replies. +--- + +This breaks the tests, which know about the details of how the reply +buffer looks in emacs. I will fix that of course, if this approach is +considered acceptable. + +The original implementation took a simplistic view of how a reply to a +complex message could be generated (essentially it tried to reduce it +to a flat list of text parts). Given that we already have code to +display more complex message structure, it seems obvious to use it. + + emacs/notmuch-mua.el | 34 ++++------------------------------ + 1 file changed, 4 insertions(+), 30 deletions(-) + +diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +index 95e4a4d..a8cff3d 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,9 @@ 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 ++ (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