--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 9CD396DE190D\r
+ for <notmuch@notmuchmail.org>; Sat, 7 Nov 2015 03:05:04 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.144\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.144 tagged_above=-999 required=5 tests=[AWL=0.426,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id UMwS1ysf_CEB for <notmuch@notmuchmail.org>;\r
+ Sat, 7 Nov 2015 03:05:03 -0800 (PST)\r
+Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com\r
+ [209.85.212.175])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 870296DE17F0\r
+ for <notmuch@notmuchmail.org>; Sat, 7 Nov 2015 03:04:49 -0800 (PST)\r
+Received: by wikq8 with SMTP id q8so43978010wik.1\r
+ for <notmuch@notmuchmail.org>; Sat, 07 Nov 2015 03:04:48 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=9zeN5Lphq6tFQ9hVHbOwj2veV6Tf/oOYVL3aW9d7yXk=;\r
+ b=mlFUlcHG55NVaY5S0hqwJgQOcx/VlrX0aZxAajbmyNFjb8cVvTjNIohaViNHuEYgoU\r
+ GyXknLClggGlP1Z8EVL82KDSWMPNvYyyjrCOfVIuAdV5dfcad/xt6rnq1GYLW06skkfc\r
+ ufFTgo0JKWAMVsvKgUXJ8l2lDuJXtZwUHHwoiLPMQiNVyOP9TJt8GZgEp8tdfAJ7RVt4\r
+ f7PrQwasD4V4MAsOU5Fou7myiAKMZzKhwtE0+CeAM35CPz2kugludz8vx9tfUFysXbLo\r
+ 8z2gL3RX7N5CDlzKRCBgOpxZdKAbElxxDO/uwcO0f8sWKZbZV93ZS88uqc96xU/FKcIY\r
+ zD9A==\r
+X-Received: by 10.194.7.69 with SMTP id h5mr19687356wja.117.1446894288122;\r
+ Sat, 07 Nov 2015 03:04:48 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id kr10sm4555351wjc.25.2015.11.07.03.04.46\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 07 Nov 2015 03:04:47 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 3/7] emacs/mua: Generate improved cited text for replies\r
+Date: Sat, 7 Nov 2015 11:04:32 +0000\r
+Message-Id: <1446894276-7814-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 07 Nov 2015 11:05:04 -0000\r
+\r
+From: David Edmondson <dme@dme.org>\r
+\r
+Use the message display code to generate message text to cite in\r
+replies.\r
+---\r
+ emacs/notmuch-mua.el | 38 ++++++++------------------------------\r
+ 1 file changed, 8 insertions(+), 30 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index fd98ea4..2f7abb0 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
+@@ -142,31 +142,6 @@ (defun notmuch-mua-reply-crypto (parts)\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
+@@ -245,10 +220,13 @@ (defun notmuch-mua-reply (query-string &optional sender reply-all)\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
++ ;; Don't attempt to clean up messages, excerpt\r
++ ;; citations, etc. in the original message before\r
++ ;; quoting.\r
++ (let ((notmuch-show-insert-text/plain-hook nil))\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.1.4\r
+\r
projects / notmuch-archives.git / commitdiff