--- /dev/null
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 7D9BC431FAF\r
+ for <notmuch@notmuchmail.org>; Wed, 7 May 2014 10:14:16 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id j8ns2fPvtHRO for <notmuch@notmuchmail.org>;\r
+ Wed, 7 May 2014 10:14:11 -0700 (PDT)\r
+Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com\r
+ [74.125.82.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ C50EB431FAE for <notmuch@notmuchmail.org>; Wed, 7 May 2014 10:14:10 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f46.google.com with SMTP id n12so1329235wgh.5\r
+ for <notmuch@notmuchmail.org>; Wed, 07 May 2014 10:14:09 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=3A5ST4yHGlWraKm1pwJXk60uFMS1rsVqWH4Y70LOIqA=;\r
+ b=V38I8hJ5RLK3zacuNZ94W2C5xuVa9KZM+VIOMr+TxgNkz11elTtxsPU7Omzx+JSrlK\r
+ LhPUeYhl3WTJ+7DBAIMsNCZYW5vlV+hVUVwdH+2Twc1bILls3ayt/KpoTphH7kIZMV+6\r
+ FdX5CwZkxGe3Na5fzyvKJe8W/MtiYoIOcCpD7os1eiN2Qzifb8JJasg8M+eBXTsK1L6F\r
+ j4LXNolD5tBz192+jQmDKuaOMmUji4VGM0OR9AJNkhPhxrPohwvJPp68202nilY84+WL\r
+ TC1Va1iawuoSJRXsDbHDJW9s88xIY45V3kdPNxtFVmsTNk57mqNvkAPVhBsyOLtp+KT8\r
+ CgaA==\r
+X-Gm-Message-State:\r
+ ALoCoQnT5kXOJkDgibXVOQT4DgTJBVl61Lb0ynpen7qsSP3wIVNzpk+IkXXMZMZaS92gn/qqK+AZ\r
+X-Received: by 10.180.89.241 with SMTP id br17mr8894899wib.0.1399482849271;\r
+ Wed, 07 May 2014 10:14:09 -0700 (PDT)\r
+Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net.\r
+ [81.149.164.25])\r
+ by mx.google.com with ESMTPSA id n5sm32835096wiz.1.2014.05.07.10.14.07\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Wed, 07 May 2014 10:14:08 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+ id B7D51108AA8; Wed, 7 May 2014 18:14:06 +0100 (BST)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC] [PATCH] emacs/notmuch-mua: Generate improved cited text for\r
+ replies\r
+Date: Wed, 7 May 2014 18:14:06 +0100\r
+Message-Id: <1399482846-25308-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.0.0.rc0\r
+In-Reply-To: <87sixdujkv.fsf@qmul.ac.uk>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 07 May 2014 17:14:16 -0000\r
+\r
+Use the message display code to generate message text to cite in\r
+replies.\r
+---\r
+\r
+This breaks the tests, which know about the details of how the reply\r
+buffer looks in emacs. I will fix that of course, if this approach is\r
+considered acceptable.\r
+\r
+The original implementation took a simplistic view of how a reply to a\r
+complex message could be generated (essentially it tried to reduce it\r
+to a flat list of text parts). Given that we already have code to\r
+display more complex message structure, it seems obvious to use it.\r
+\r
+ emacs/notmuch-mua.el | 34 ++++------------------------------\r
+ 1 file changed, 4 insertions(+), 30 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 95e4a4d..a8cff3d 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -28,7 +28,7 @@\r
+ \r
+ (eval-when-compile (require 'cl))\r
+ \r
+-(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
++(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))\r
+ \r
+ ;;\r
+ \r
+@@ -123,31 +123,6 @@ list."\r
+ else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+ do (notmuch-mua-reply-crypto (plist-get part :content))))\r
+ \r
+-(defun notmuch-mua-get-quotable-parts (parts)\r
+- (loop for part in parts\r
+- if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative")\r
+- collect (let* ((subparts (plist-get part :content))\r
+- (types (mapcar (lambda (part) (plist-get part :content-type)) subparts))\r
+- (chosen-type (car (notmuch-multipart/alternative-choose types))))\r
+- (loop for part in (reverse subparts)\r
+- if (notmuch-match-content-type (plist-get part :content-type) chosen-type)\r
+- return part))\r
+- else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+- append (notmuch-mua-get-quotable-parts (plist-get part :content))\r
+- else if (notmuch-match-content-type (plist-get part :content-type) "text/*")\r
+- collect part))\r
+-\r
+-(defun notmuch-mua-insert-quotable-part (message part)\r
+- ;; We don't want text properties leaking from the show renderer into\r
+- ;; the reply so we use a temp buffer. Also we don't want hooks, such\r
+- ;; as notmuch-wash-*, to be run on the quotable part so we set\r
+- ;; notmuch-show-insert-text/plain-hook to nil.\r
+- (insert (with-temp-buffer\r
+- (let ((notmuch-show-insert-text/plain-hook nil))\r
+- ;; Show the part but do not add buttons.\r
+- (notmuch-show-insert-bodypart message part 0 'no-buttons))\r
+- (buffer-substring-no-properties (point-min) (point-max)))))\r
+-\r
+ ;; There is a bug in emacs 23's message.el that results in a newline\r
+ ;; not being inserted after the References header, so the next header\r
+ ;; is concatenated to the end of it. This function fixes the problem,\r
+@@ -225,10 +200,9 @@ list."\r
+ (insert "From: " from "\n")\r
+ (insert "Date: " date "\n\n")\r
+ \r
+- ;; Get the parts of the original message that should be quoted; this includes\r
+- ;; all the text parts, except the non-preferred ones in a multipart/alternative.\r
+- (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))\r
+- (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))\r
++ (insert (with-temp-buffer\r
++ (notmuch-show-insert-body original (plist-get original :body) 0)\r
++ (buffer-substring-no-properties (point-min) (point-max))))\r
+ \r
+ (set-mark (point))\r
+ (goto-char start)\r
+-- \r
+2.0.0.rc0\r
+\r
projects / notmuch-archives.git / commitdiff