--- /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 6BD9A431FBD\r
+ for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 21:42:50 -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 tests=[none]\r
+ 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 DyHbLI4ejKCf for <notmuch@notmuchmail.org>;\r
+ Tue, 14 Feb 2012 21:42:49 -0800 (PST)\r
+Received: from smtp-out-04.shaw.ca (smtp-out-04.shaw.ca [64.59.134.12])\r
+ by olra.theworths.org (Postfix) with ESMTP id AA4A0431FBC\r
+ for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 21:42:48 -0800 (PST)\r
+Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd6ml3no-ssvc.prod.shaw.ca)\r
+ ([10.0.144.222])\r
+ by pd5mo1no-svcs.prod.shaw.ca with ESMTP; 14 Feb 2012 22:42:48 -0700\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=gFGh1ScE7ROJHT2jhivHYaSHya8441O0LZB7wkhlVyo=\r
+ c=1 sm=1\r
+ a=C2pUrtVCOpAA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+ a=H4IEW4q-AAAA:8 a=7343-z1_AAAA:8 a=V2sgnzSHAAAA:8 a=SuFOw32sAAAA:8\r
+ a=pGLkceISAAAA:8 a=uZvujYp8AAAA:8 a=_ctWjzdLAAAA:8\r
+ a=DT5hYQGO3e35CuGonQwA:9\r
+ a=vBJMJYV-CGqP2jNsBF4A:7 a=0BPXsuqt4rsA:10 a=-xelrQF7p3AA:10\r
+ a=Kw4u8EAyA4wA:10 a=0c-eHkXYtrgA:10 a=Gb7Eya4fYr0A:10 a=MSl-tDqOz04A:10\r
+ a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+ by pd6ml3no-dmz.prod.shaw.ca with ESMTP; 14 Feb 2012 22:42:47 -0700\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+ id 513908004EBA; Tue, 14 Feb 2012 22:42:46 -0700 (MST)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5.1 4/4] emacs: Use the new JSON reply format and\r
+ message-cite-original\r
+Date: Tue, 14 Feb 2012 22:42:45 -0700\r
+Message-Id: <1329284565-2435-1-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1329282027-29457-5-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1329282027-29457-5-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: Wed, 15 Feb 2012 05:42:50 -0000\r
+\r
+Using the new JSON reply format allows emacs to quote HTML parts\r
+nicely by using mm-display-part to turn them into displayable text,\r
+then quoting them with message-cite-original. This is very useful for\r
+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 test has been updated to reflect the (ugly) emacs default.\r
+---\r
+\r
+Adjusted the header display to be consistent with the other JSON formats.\r
+\r
+ emacs/notmuch-lib.el | 39 +++++++++++++++\r
+ emacs/notmuch-mua.el | 123 +++++++++++++++++++++++++++++++++++--------------\r
+ emacs/notmuch-show.el | 24 +---------\r
+ test/emacs | 101 +++++++++++++++++++++++++++++++++++++++-\r
+ 4 files changed, 228 insertions(+), 59 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index d315f76..3fc7aff 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -21,6 +21,8 @@\r
+ \r
+ ;; This is an part of an emacs-based interface to the notmuch mail system.\r
+ \r
++(eval-when-compile (require 'cl))\r
++\r
+ (defvar notmuch-command "notmuch"\r
+ "Command to run the notmuch binary.")\r
+ \r
+@@ -173,6 +175,43 @@ the user hasn't set this variable with the old or new value."\r
+ (list 'when (< emacs-major-version 23)\r
+ form))\r
+ \r
++(defun notmuch-split-content-type (content-type)\r
++ "Split content/type into 'content' and 'type'"\r
++ (split-string content-type "/"))\r
++\r
++(defun notmuch-match-content-type (t1 t2)\r
++ "Return t if t1 and t2 are matching content types, taking wildcards into account"\r
++ (let ((st1 (notmuch-split-content-type t1))\r
++ (st2 (notmuch-split-content-type t2)))\r
++ (if (or (string= (cadr st1) "*")\r
++ (string= (cadr st2) "*"))\r
++ (string= (car st1) (car st2))\r
++ (string= t1 t2))))\r
++\r
++(defvar notmuch-multipart/alternative-discouraged\r
++ '(\r
++ ;; Avoid HTML parts.\r
++ "text/html"\r
++ ;; multipart/related usually contain a text/html part and some associated graphics.\r
++ "multipart/related"\r
++ ))\r
++\r
++(defun notmuch-multipart/alternative-choose (types)\r
++ "Return a list of preferred types from the given list of types"\r
++ ;; Based on `mm-preferred-alternative-precedence'.\r
++ (let ((seq types))\r
++ (dolist (pref (reverse notmuch-multipart/alternative-discouraged))\r
++ (dolist (elem (copy-sequence seq))\r
++ (when (string-match pref elem)\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..c2fc8c5 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
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 43408d9..90cdd38 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -513,30 +513,13 @@ current buffer, if possible."\r
+ (mm-display-part handle)\r
+ t))))))\r
+ \r
+-(defvar notmuch-show-multipart/alternative-discouraged\r
+- '(\r
+- ;; Avoid HTML parts.\r
+- "text/html"\r
+- ;; multipart/related usually contain a text/html part and some associated graphics.\r
+- "multipart/related"\r
+- ))\r
+-\r
+ (defun notmuch-show-multipart/*-to-list (part)\r
+ (mapcar (lambda (inner-part) (plist-get inner-part :content-type))\r
+ (plist-get part :content)))\r
+ \r
+-(defun notmuch-show-multipart/alternative-choose (types)\r
+- ;; Based on `mm-preferred-alternative-precedence'.\r
+- (let ((seq types))\r
+- (dolist (pref (reverse notmuch-show-multipart/alternative-discouraged))\r
+- (dolist (elem (copy-sequence seq))\r
+- (when (string-match pref elem)\r
+- (setq seq (nconc (delete elem seq) (list elem))))))\r
+- seq))\r
+-\r
+ (defun notmuch-show-insert-part-multipart/alternative (msg part content-type nth depth declared-type)\r
+ (notmuch-show-insert-part-header nth declared-type content-type nil)\r
+- (let ((chosen-type (car (notmuch-show-multipart/alternative-choose (notmuch-show-multipart/*-to-list part))))\r
++ (let ((chosen-type (car (notmuch-multipart/alternative-choose (notmuch-show-multipart/*-to-list part))))\r
+ (inner-parts (plist-get part :content))\r
+ (start (point)))\r
+ ;; This inserts all parts of the chosen type rather than just one,\r
+@@ -775,9 +758,6 @@ current buffer, if possible."\r
+ \r
+ ;; Functions for determining how to handle MIME parts.\r
+ \r
+-(defun notmuch-show-split-content-type (content-type)\r
+- (split-string content-type "/"))\r
+-\r
+ (defun notmuch-show-handlers-for (content-type)\r
+ "Return a list of content handlers for a part of type CONTENT-TYPE."\r
+ (let (result)\r
+@@ -788,7 +768,7 @@ current buffer, if possible."\r
+ (list (intern (concat "notmuch-show-insert-part-*/*"))\r
+ (intern (concat\r
+ "notmuch-show-insert-part-"\r
+- (car (notmuch-show-split-content-type content-type))\r
++ (car (notmuch-split-content-type content-type))\r
+ "/*"))\r
+ (intern (concat "notmuch-show-insert-part-" content-type))))\r
+ result))\r
+diff --git a/test/emacs b/test/emacs\r
+index d4a8d30..a6786d4 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -268,11 +268,107 @@ 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_emacs '(notmuch-show "id:20091118002059.067214ed@hikari")\r
++ (notmuch-show-reply)\r
++ (test-output)'\r
++cat <<EOF >EXPECTED\r
++From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
++To: Adrian Perez de Castro <aperez@igalia.com>, notmuch@notmuchmail.org\r
++Subject: Re: [notmuch] Introducing myself\r
++In-Reply-To: <20091118002059.067214ed@hikari>\r
++Fcc: ${MAIL_DIR}/sent\r
++--text follows this line--\r
++Adrian Perez de Castro <aperez@igalia.com> writes:\r
++\r
++> Hello to all,\r
++>\r
++> I have just heard about Not Much today in some random Linux-related news\r
++> site (LWN?), my name is Adrian Perez and I work as systems administrator\r
++> (although I can do some code as well :P). I have always thought that the\r
++> ideas behind Sup were great, but after some time using it, I got tired of\r
++> the oddities that it has. I also do not like doing things like having to\r
++> install Ruby just for reading and sorting mails. Some time ago I thought\r
++> about doing something like Not Much and in fact I played a bit with the\r
++> Python+Xapian and the Python+Whoosh combinations, because I find relaxing\r
++> to code things in Python when I am not working and also it is installed\r
++> by default on most distribution. I got to have some mailboxes indexed and\r
++> basic searching working a couple of months ago. Lately I have been very\r
++> busy and had no time for coding, and them... boom! Not Much appears -- and\r
++> it is almost exactly what I was trying to do, but faster. I have been\r
++> playing a bit with Not Much today, and I think it has potential.\r
++>\r
++> Also, I would like to share one idea I had in mind, that you might find\r
++> interesting: One thing I have found very annoying is having to re-tag my\r
++> mail when the indexes get b0rked (it happened a couple of times to me while\r
++> using Sup), so I was planning to mails as read/unread and adding the tags\r
++> not just to the index, but to the mail text itself, e.g. by adding a\r
++> "X-Tags" header field or by reusing the "Keywords" one. This way, the index\r
++> could be totally recreated by re-reading the mail directories, and this\r
++> would also allow to a tools like OfflineIMAP [1] to get the mails into a\r
++> local maildir, tagging and indexing the mails with the e-mail reader and\r
++> then syncing back the messages with the "X-Tags" header to the IMAP server.\r
++> This would allow to use the mail reader from a different computer and still\r
++> have everything tagged finely.\r
++>\r
++> Best regards,\r
++>\r
++>\r
++> ---\r
++> [1] http://software.complete.org/software/projects/show/offlineimap\r
++>\r
++> -- \r
++> Adrian Perez de Castro <aperez@igalia.com>\r
++> Igalia - Free Software Engineering\r
++> _______________________________________________\r
++> notmuch mailing list\r
++> notmuch@notmuchmail.org\r
++> http://notmuchmail.org/mailman/listinfo/notmuch\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "Reply within emacs to a multipart/alternative message"\r
++test_emacs '(notmuch-show "id:cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com")\r
++ (notmuch-show-reply)\r
++ (test-output)'\r
++cat <<EOF >EXPECTED\r
++From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
++To: Alex Botero-Lowry <alex.boterolowry@gmail.com>, notmuch@notmuchmail.org\r
++Subject: Re: [notmuch] preliminary FreeBSD support\r
++In-Reply-To: <cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com>\r
++Fcc: ${MAIL_DIR}/sent\r
++--text follows this line--\r
++Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:\r
++\r
++> I saw the announcement this morning, and was very excited, as I had been\r
++> hoping sup would be turned into a library,\r
++> since I like the concept more than the UI (I'd rather an emacs interface).\r
++>\r
++> I did a preliminary compile which worked out fine, but\r
++> sysconf(_SC_SC_GETPW_R_SIZE_MAX) returns -1 on\r
++> FreeBSD, so notmuch_config_open segfaulted.\r
++>\r
++> Attached is a patch that supplies a default buffer size of 64 in cases where\r
++> -1 is returned.\r
++>\r
++> http://www.opengroup.org/austin/docs/austin_328.txt - seems to indicate this\r
++> is acceptable behavior,\r
++> and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically\r
++> uses 64 as the\r
++> buffer size.\r
++> _______________________________________________\r
++> notmuch mailing list\r
++> notmuch@notmuchmail.org\r
++> http://notmuchmail.org/mailman/listinfo/notmuch\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
+ test_begin_subtest "Quote MML tags in reply"\r
+ message_id='test-emacs-mml-quoting@message.id'\r
+ add_message [id]="$message_id" \\r
+@@ -288,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