--- /dev/null
+Return-Path: <awg@lagos.xvx.ca>\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 06F4241ED92\r
+ for <notmuch@notmuchmail.org>; Wed, 15 Feb 2012 19:12:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 0mBuM5jTZ4mF for <notmuch@notmuchmail.org>;\r
+ Wed, 15 Feb 2012 19:12:54 -0800 (PST)\r
+Received: from idcmail-mo2no.shaw.ca (idcmail-mo2no.shaw.ca [64.59.134.9])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9DDCA429E4F\r
+ for <notmuch@notmuchmail.org>; Wed, 15 Feb 2012 19:12:47 -0800 (PST)\r
+Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd6ml1no-ssvc.prod.shaw.ca)\r
+ ([10.0.144.222])\r
+ by pd6mo1no-svcs.prod.shaw.ca with ESMTP; 15 Feb 2012 20:12:47 -0700\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=Cufqhujp69hR+MhiHu40yK/USb/hlYs0+irVU46A6+k=\r
+ c=1 sm=1\r
+ a=Z5iDYLMGwAcA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+ a=H4IEW4q-AAAA:8 a=7343-z1_AAAA:8 a=pGLkceISAAAA:8\r
+ a=sW8ZUVT9fjtYQyWcCR4A:9\r
+ a=dH1UOewsV4vhkg3hdfQA:7 a=0BPXsuqt4rsA:10 a=Kw4u8EAyA4wA:10\r
+ a=0c-eHkXYtrgA:10 a=q9ffXd82REXWyX97:21 a=OF_rVAV-Bfowtp03:21\r
+ a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+ by pd6ml1no-dmz.prod.shaw.ca with ESMTP; 15 Feb 2012 20:12:46 -0700\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+ id 40B318000D51; Wed, 15 Feb 2012 20:12:46 -0700 (MST)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5.2 7/7] emacs: Use the new JSON reply format and\r
+ message-cite-original\r
+Date: Wed, 15 Feb 2012 20:12:37 -0700\r
+Message-Id: <1329361957-28493-8-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1329361957-28493-1-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1329361957-28493-1-git-send-email-awg+notmuch@xvx.ca>\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: Thu, 16 Feb 2012 03:12:58 -0000\r
+\r
+Use the new JSON reply format to create replies in emacs. Quote HTML\r
+parts nicely by using mm-display-part to turn them into displayable\r
+text, then quoting them with message-cite-original. This is very\r
+useful for users who regularly receive HTML-only email.\r
+\r
+Use message-mode's message-cite-original function to create the\r
+quoted body for reply messages. In order to make this act like the\r
+existing notmuch defaults, you will need to set the following in\r
+your emacs configuration:\r
+\r
+message-citation-line-format "On %a, %d %b %Y, %f wrote:"\r
+message-citation-line-function 'message-insert-formatted-citation-line\r
+\r
+The tests have been updated to reflect the (ugly) emacs default.\r
+---\r
+ emacs/notmuch-lib.el | 6 ++\r
+ emacs/notmuch-mua.el | 127 +++++++++++++++++++++++++++++++++++---------------\r
+ test/emacs | 8 ++--\r
+ 3 files changed, 100 insertions(+), 41 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 7e3f110..3fc7aff 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -206,6 +206,12 @@ the user hasn't set this variable with the old or new value."\r
+ (setq seq (nconc (delete elem seq) (list elem))))))\r
+ seq))\r
+ \r
++(defun notmuch-parts-filter-by-type (parts type)\r
++ "Given a vector of message parts, return a vector containing the ones matching the given type."\r
++ (loop for part across parts\r
++ if (notmuch-match-content-type (cdr (assq 'content-type part)) type)\r
++ vconcat (list part)))\r
++\r
+ ;; Compatibility functions for versions of emacs before emacs 23.\r
+ ;;\r
+ ;; Both functions here were copied from emacs 23 with the following copyright:\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 4be7c13..7d43821 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -19,11 +19,15 @@\r
+ ;;\r
+ ;; Authors: David Edmondson <dme@dme.org>\r
+ \r
++(require 'json)\r
+ (require 'message)\r
++(require 'format-spec)\r
+ \r
+ (require 'notmuch-lib)\r
+ (require 'notmuch-address)\r
+ \r
++(eval-when-compile (require 'cl))\r
++\r
+ ;;\r
+ \r
+ (defcustom notmuch-mua-send-hook '(notmuch-mua-message-send-hook)\r
+@@ -72,56 +76,105 @@ list."\r
+ (push header message-hidden-headers)))\r
+ notmuch-mua-hidden-headers))\r
+ \r
++(defun notmuch-mua-get-displayed-part (part query-string)\r
++ (with-temp-buffer\r
++ (if (assq 'content part)\r
++ (insert (cdr (assq 'content part)))\r
++ (call-process notmuch-command nil t nil "show" "--format=raw"\r
++ (format "--part=%s" (cdr (assq 'id part)))\r
++ query-string))\r
++\r
++ (let ((handle (mm-make-handle (current-buffer) (list (cdr (assq 'content-type part)))))\r
++ (end-of-orig (point-max)))\r
++ (mm-display-part handle)\r
++ (delete-region (point-min) end-of-orig)\r
++ (buffer-substring (point-min) (point-max)))))\r
++\r
++(defun notmuch-mua-multipart/*-to-list (parts)\r
++ (loop for part across parts\r
++ collect (cdr (assq 'content-type part))))\r
++\r
++(defun notmuch-mua-get-quotable-parts (parts)\r
++ (loop for part across parts\r
++ if (notmuch-match-content-type (cdr (assq 'content-type part)) "multipart/alternative")\r
++ append (let* ((subparts (cdr (assq 'content part)))\r
++ (types (notmuch-mua-multipart/*-to-list subparts))\r
++ (chosen-type (car (notmuch-multipart/alternative-choose types))))\r
++ (notmuch-mua-get-quotable-parts (notmuch-parts-filter-by-type subparts chosen-type)))\r
++ else if (notmuch-match-content-type (cdr (assq 'content-type part)) "multipart/*")\r
++ append (notmuch-mua-get-quotable-parts (cdr (assq 'content part)))\r
++ else if (notmuch-match-content-type (cdr (assq 'content-type part)) "text/*")\r
++ collect part))\r
++\r
+ (defun notmuch-mua-reply (query-string &optional sender reply-all)\r
+- (let (headers\r
+- body\r
+- (args '("reply")))\r
+- (if notmuch-show-process-crypto\r
+- (setq args (append args '("--decrypt"))))\r
++ (let ((args '("reply" "--format=json"))\r
++ reply\r
++ original)\r
++ (when notmuch-show-process-crypto\r
++ (setq args (append args '("--decrypt"))))\r
++\r
+ (if reply-all\r
+ (setq args (append args '("--reply-to=all")))\r
+ (setq args (append args '("--reply-to=sender"))))\r
+ (setq args (append args (list query-string)))\r
+- ;; This make assumptions about the output of `notmuch reply', but\r
+- ;; really only that the headers come first followed by a blank\r
+- ;; line and then the body.\r
++\r
++ ;; Get the reply object as JSON, and parse it into an elisp object.\r
+ (with-temp-buffer\r
+ (apply 'call-process (append (list notmuch-command nil (list t t) nil) args))\r
+ (goto-char (point-min))\r
+- (if (re-search-forward "^$" nil t)\r
+- (save-excursion\r
+- (save-restriction\r
+- (narrow-to-region (point-min) (point))\r
+- (goto-char (point-min))\r
+- (setq headers (mail-header-extract)))))\r
+- (forward-line 1)\r
+- (setq body (buffer-substring (point) (point-max))))\r
+- ;; If sender is non-nil, set the From: header to its value.\r
+- (when sender\r
+- (mail-header-set 'from sender headers))\r
+- (let\r
+- ;; Overlay the composition window on that being used to read\r
+- ;; the original message.\r
+- ((same-window-regexps '("\\*mail .*")))\r
+- (notmuch-mua-mail (mail-header 'to headers)\r
+- (mail-header 'subject headers)\r
+- (message-headers-to-generate headers t '(to subject))))\r
+- ;; insert the message body - but put it in front of the signature\r
+- ;; if one is present\r
+- (goto-char (point-max))\r
+- (if (re-search-backward message-signature-separator nil t)\r
++ (setq reply (json-read)))\r
++\r
++ ;; Extract the original message to simplify the following code.\r
++ (setq original (cdr (assq 'original reply)))\r
++\r
++ ;; Extract the headers of both the reply and the original message.\r
++ (let* ((original-headers (cdr (assq 'headers original)))\r
++ (reply-headers (cdr (assq 'reply-headers reply))))\r
++\r
++ ;; If sender is non-nil, set the From: header to its value.\r
++ (when sender\r
++ (mail-header-set 'From sender reply-headers))\r
++ (let\r
++ ;; Overlay the composition window on that being used to read\r
++ ;; the original message.\r
++ ((same-window-regexps '("\\*mail .*")))\r
++ (notmuch-mua-mail (mail-header 'To reply-headers)\r
++ (mail-header 'Subject reply-headers)\r
++ (message-headers-to-generate reply-headers t '(To Subject))))\r
++ ;; Insert the message body - but put it in front of the signature\r
++ ;; if one is present\r
++ (goto-char (point-max))\r
++ (if (re-search-backward message-signature-separator nil t)\r
+ (forward-line -1)\r
+- (goto-char (point-max)))\r
+- (insert body)\r
+- (push-mark))\r
+- (set-buffer-modified-p nil)\r
++ (goto-char (point-max)))\r
++\r
++ (let ((from (cdr (assq 'From original-headers)))\r
++ (date (cdr (assq 'Date original-headers)))\r
++ (start (point)))\r
++\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 (cdr (assq 'body original)))))\r
++ (mapc (lambda (part)\r
++ (insert (notmuch-mua-get-displayed-part part query-string)))\r
++ quotable-parts))\r
++\r
++ (push-mark)\r
++ (goto-char start)\r
++ ;; Quote the original message according to the user's configured style.\r
++ (message-cite-original))))\r
+ \r
++ (push-mark)\r
+ (message-goto-body)\r
+ ;; Original message may contain (malicious) MML tags. We must\r
+ ;; properly quote them in the reply. Note that using `point-max'\r
+ ;; instead of `mark' here is wrong. The buffer may include user's\r
+ ;; signature which should not be MML-quoted.\r
+- (mml-quote-region (point) (mark)))\r
++ (mml-quote-region (point) (mark))\r
++ (set-buffer-modified-p nil))\r
+ \r
+ (defun notmuch-mua-forward-message ()\r
+ (message-forward)\r
+@@ -147,7 +200,7 @@ OTHER-ARGS are passed through to `message-mail'."\r
+ (when (not (string= "" user-agent))\r
+ (push (cons "User-Agent" user-agent) other-headers))))\r
+ \r
+- (unless (mail-header 'from other-headers)\r
++ (unless (mail-header 'From other-headers)\r
+ (push (cons "From" (concat\r
+ (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))\r
+ \r
+@@ -210,7 +263,7 @@ the From: address first."\r
+ (interactive "P")\r
+ (let ((other-headers\r
+ (when (or prompt-for-sender notmuch-always-prompt-for-sender)\r
+- (list (cons 'from (notmuch-mua-prompt-for-sender))))))\r
++ (list (cons 'From (notmuch-mua-prompt-for-sender))))))\r
+ (notmuch-mua-mail nil nil other-headers)))\r
+ \r
+ (defun notmuch-mua-new-forward-message (&optional prompt-for-sender)\r
+diff --git a/test/emacs b/test/emacs\r
+index c3a75e9..a6786d4 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -268,13 +268,13 @@ Subject: Re: Testing message sent via SMTP\r
+ In-Reply-To: <XXX>\r
+ Fcc: $(pwd)/mail/sent\r
+ --text follows this line--\r
+-On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
++Notmuch Test Suite <test_suite@notmuchmail.org> writes:\r
++\r
+ > This is a test that messages are sent via SMTP\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply within emacs to a multipart/mixed message"\r
+-test_subtest_known_broken\r
+ test_emacs '(notmuch-show "id:20091118002059.067214ed@hikari")\r
+ (notmuch-show-reply)\r
+ (test-output)'\r
+@@ -334,7 +334,6 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Reply within emacs to a multipart/alternative message"\r
+-test_subtest_known_broken\r
+ test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")\r
+ (notmuch-show-reply)\r
+ (test-output)'\r
+@@ -385,7 +384,8 @@ Subject: Re: Quote MML tags in reply\r
+ In-Reply-To: <test-emacs-mml-quoting@message.id>\r
+ Fcc: ${MAIL_DIR}/sent\r
+ --text follows this line--\r
+-On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
++Notmuch Test Suite <test_suite@notmuchmail.org> writes:\r
++\r
+ > <#!part disposition=inline>\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+-- \r
+1.7.5.4\r
+\r
projects / notmuch-archives.git / commitdiff