--- /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 arlo.cworth.org (Postfix) with ESMTP id 3EFE26DE1603\r
+ for <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 12:30:47 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.079\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.079 tagged_above=-999 required=5\r
+ tests=[AWL=-0.012, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=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 QE3BvZoopd_J for <notmuch@notmuchmail.org>;\r
+ Tue, 9 Feb 2016 12:30:45 -0800 (PST)\r
+Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com\r
+ [74.125.82.68]) by arlo.cworth.org (Postfix) with ESMTPS id F36576DE1635 for\r
+ <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 12:30:44 -0800 (PST)\r
+Received: by mail-wm0-f68.google.com with SMTP id p63so52168wmp.1\r
+ for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 12:30:44 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=to:subject:in-reply-to:references:from:date:message-id:mime-version\r
+ :content-type; bh=5pMxtykuU3wo7nHcvCZlorG2pXhcoN5OHbWw8ZXafZw=;\r
+ b=ZQsIG9hBnmsX20j3nxmcZUGUshh7C4hmwLRpCmC+UVD903l4Y6XRn9s44/Ybm5mdYV\r
+ acSPwj1E6/1cww5UXsSIURfW4XOd6WsLs2S6LqQ2njipT7RLQ3CWpszEp+3931ZqZGG/\r
+ JwGKC201bN8oD0+m/L8oXQkgORPUQgpXFfeys0FaMzS2yMynhW1QzwOFBpIsPoNRjmSg\r
+ SI12POMcnFBBgttmX3A5m3TvDRNC8XCnHDw9566LMSK1BHowJP/PGDD4cCl/r4zRazTX\r
+ 1U49Nwv2tJc4+5MUJMaEgW79scXFE/FN5WPMIcxERMW1inSl5OwlYU7fz7rH0t8bZFJS\r
+ 0WVA==\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:to:subject:in-reply-to:references:from:date\r
+ :message-id:mime-version:content-type;\r
+ bh=5pMxtykuU3wo7nHcvCZlorG2pXhcoN5OHbWw8ZXafZw=;\r
+ b=FW1q3rOw3GWSsrrrZcaIM9OwDkUIOYJZIBfWzpn//u3JPNOl6yhL/oMJw7Q+RL1Xll\r
+ dC1nIwfMd+k3eRQ9y7LeWiTm6btMNQYVgQZJl8/oI/CakyPcql2dWaHg8NrNcj77R+uW\r
+ YmsAOajlDcR7SUpF7n0w/xd6klLSt1Ye5o/IiuQo1LZJ9KCTZ7g3eXp1NS3nt+CT5xh3\r
+ WZTdj/4r9kjaYIDlOppKCSqzm5EtIVqlh2qV5FX1Zv+lnmWX5mOJCrC2WYuuxAwhIm5G\r
+ 1MyBln7/u5AlsRio7s3SkSmzVgfLT4ZFFIVz0NyOuHWdbja2X7+jgAw4s78DsdWtz5ym\r
+ XRAw==\r
+X-Gm-Message-State:\r
+ AG10YOTDHkuEmKi1pzk8ICfkz7/3yGqYl+J2zHI9s4ZT2XYJ94Jj6YnvLJZY332S7pRoqA==\r
+X-Received: by 10.194.112.41 with SMTP id in9mr35652468wjb.139.1455049843588; \r
+ Tue, 09 Feb 2016 12:30:43 -0800 (PST)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id r62sm245796wmd.15.2016.02.09.12.30.41\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 09 Feb 2016 12:30:42 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 91c0c906;\r
+ Tue, 9 Feb 2016 20:30:41 +0000 (UTC)\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v4 3/7] emacs/mua: Generate improved cited text for\r
+ replies\r
+In-Reply-To: <1446894276-7814-4-git-send-email-markwalters1009@gmail.com>\r
+References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+ <1446894276-7814-4-git-send-email-markwalters1009@gmail.com>\r
+From: David Edmondson <dme@dme.org>\r
+Date: Tue, 09 Feb 2016 20:30:41 +0000\r
+Message-ID: <m2a8n94oem.fsf@dme.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Tue, 09 Feb 2016 20:30:47 -0000\r
+\r
+On Sat, Nov 07 2015, Mark Walters wrote:\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
+Looks fine.\r
+\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
projects / notmuch-archives.git / commitdiff