Update the expected output of the tests to conform with the new citation tidying. --- .../notmuch-show-elide-non-matching-messages-off | 2 ++ .../notmuch-show-elide-non-matching-messages-on | 2 ++ .../notmuch-show-indent-thread-content-off | 2 ++ .../notmuch-show-process-crypto-mime-parts-off | 1 + .../notmuch-show-process-crypto-mime-parts-on | 1 + .../emacs.expected-output/notmuch-show-message-with-headers-hidden | 4 ++-- .../notmuch-show-message-with-headers-visible | 4 ++-- test/emacs.expected-output/notmuch-show-thread-maildir-storage | 7 ++++++- .../notmuch-show-thread-maildir-storage-with-fourfold-indentation | 7 ++++++- .../notmuch-show-thread-maildir-storage-without-indentation | 7 ++++++- .../notmuch-show-thread-with-all-messages-uncollapsed | 5 +++-- 11 files changed, 33 insertions(+), 9 deletions(-) diff --git a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off index e0bd2c73..7b588e76 100644 --- a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off +++ b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off @@ -42,6 +42,7 @@ Cheers, [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives @@ -69,6 +70,7 @@ Cheers, [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my > private notmuch repository diff --git a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on index d76d0952..79633344 100644 --- a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on +++ b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on @@ -41,6 +41,7 @@ Cheers, [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives @@ -66,6 +67,7 @@ Cheers, [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my > private notmuch repository diff --git a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off index 1a06374d..79f1e73b 100644 --- a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off +++ b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off @@ -42,6 +42,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500 [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives @@ -69,6 +70,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500 [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my > private notmuch repository diff --git a/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off index ce2892a0..c88522ca 100644 --- a/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off +++ b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off @@ -11,6 +11,7 @@ Subject: [notmuch] Working with Maildir storage? [ multipart/signed ] [ Unknown signature status ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives diff --git a/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on index eaa557a0..c5ebca86 100644 --- a/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on +++ b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-on @@ -11,6 +11,7 @@ Subject: [notmuch] Working with Maildir storage? [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives diff --git a/test/emacs.expected-output/notmuch-show-message-with-headers-hidden b/test/emacs.expected-output/notmuch-show-message-with-headers-hidden index 9d7f91b6..1d05574e 100644 --- a/test/emacs.expected-output/notmuch-show-message-with-headers-hidden +++ b/test/emacs.expected-output/notmuch-show-message-with-headers-hidden @@ -3,10 +3,10 @@ Subject: [notmuch] What a great idea! Jan Janak <jan@ryngle.com> (2009-11-17) (inbox) On Tue, Nov 17, 2009 at 11:35 PM, Jan Janak <jan at ryngle.com> wrote: + > Hello, > - > First of all, notmuch is a wonderful idea, both the cmdline tool and - [ 2 more citation lines. Click/Enter to show. ] + [ 3 more citation lines. Click/Enter to show. ] > > Have you considered sending an announcement to the org-mode mailing list? > http://org-mode.org diff --git a/test/emacs.expected-output/notmuch-show-message-with-headers-visible b/test/emacs.expected-output/notmuch-show-message-with-headers-visible index 8efbd60d..22aea837 100644 --- a/test/emacs.expected-output/notmuch-show-message-with-headers-visible +++ b/test/emacs.expected-output/notmuch-show-message-with-headers-visible @@ -6,10 +6,10 @@ Subject: [notmuch] What a great idea! Date: Tue, 17 Nov 2009 23:38:47 +0100 On Tue, Nov 17, 2009 at 11:35 PM, Jan Janak <jan at ryngle.com> wrote: + > Hello, > - > First of all, notmuch is a wonderful idea, both the cmdline tool and - [ 2 more citation lines. Click/Enter to show. ] + [ 3 more citation lines. Click/Enter to show. ] > > Have you considered sending an announcement to the org-mode mailing list? > http://org-mode.org diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage index 1f89dbef..b3bb8bbc 100644 --- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage @@ -81,6 +81,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives @@ -139,7 +140,8 @@ http://notmuchmail.org/mailman/listinfo/notmuch On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: - > > See the patch just posted here. + + >> See the patch just posted here. I've also pushed a slightly more complicated (and complete) fix to my private notmuch repository @@ -164,6 +166,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my > private notmuch repository @@ -189,6 +192,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: + > I saw the LWN article and decided to take a look at notmuch. I'm > currently using mutt and mairix to index and read a collection of > Maildir mail folders (around 40,000 messages total). @@ -199,6 +203,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch That's very interesting. So, thanks for coming and trying out notmuch. > Error opening + > > /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S: > Too many open files diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation index 5c4ec979..2a4828e8 100644 --- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation @@ -81,6 +81,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives @@ -141,7 +142,8 @@ http://notmuchmail.org/mailman/listinfo/notmuch On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: - > > See the patch just posted here. + + >> See the patch just posted here. I've also pushed a slightly more complicated (and complete) fix to my @@ -167,6 +169,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > I've also pushed a slightly more complicated (and complete) > fix to my > private notmuch repository @@ -194,6 +197,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: + > I saw the LWN article and decided to take a look at notmuch. I'm > currently using mutt and mairix to index and read a collection of > Maildir mail folders (around 40,000 messages total). @@ -204,6 +208,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch That's very interesting. So, thanks for coming and trying out notmuch. > Error opening + > > /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S: > Too many open files diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation index 24cdd56e..eb721d6b 100644 --- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation @@ -81,6 +81,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500 [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > See the patch just posted here. Is the list archived anywhere? The obvious archives @@ -139,7 +140,8 @@ Date: Tue, 17 Nov 2009 13:24:13 -0800 On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: -> > See the patch just posted here. + +>> See the patch just posted here. I've also pushed a slightly more complicated (and complete) fix to my private notmuch repository @@ -164,6 +166,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500 [ multipart/signed ] [ Unknown key ID 0xD74695063141ACD8 or unsupported algorithm ] [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my > private notmuch repository @@ -189,6 +192,7 @@ Date: Wed, 18 Nov 2009 02:08:10 -0800 On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at seas.harvard.edu> wrote: + > I saw the LWN article and decided to take a look at notmuch. I'm > currently using mutt and mairix to index and read a collection of > Maildir mail folders (around 40,000 messages total). @@ -199,6 +203,7 @@ I hadn't even seen that Keith's blog post had been picked up by lwn.net. That's very interesting. So, thanks for coming and trying out notmuch. > Error opening +> > /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S: > Too many open files diff --git a/test/emacs.expected-output/notmuch-show-thread-with-all-messages-uncollapsed b/test/emacs.expected-output/notmuch-show-thread-with-all-messages-uncollapsed index bd5598e0..a2db5663 100644 --- a/test/emacs.expected-output/notmuch-show-thread-with-all-messages-uncollapsed +++ b/test/emacs.expected-output/notmuch-show-thread-with-all-messages-uncollapsed @@ -24,10 +24,10 @@ there.. Date: Tue, 17 Nov 2009 23:38:47 +0100 On Tue, Nov 17, 2009 at 11:35 PM, Jan Janak <jan at ryngle.com> wrote: + > Hello, > - > First of all, notmuch is a wonderful idea, both the cmdline tool and - [ 2 more citation lines. Click/Enter to show. ] + [ 3 more citation lines. Click/Enter to show. ] > > Have you considered sending an announcement to the org-mode mailing list? > http://org-mode.org @@ -46,6 +46,7 @@ there.. Date: Wed, 18 Nov 2009 02:49:52 -0800 On Tue, 17 Nov 2009 23:35:30 +0100, Jan Janak <jan at ryngle.com> wrote: + > First of all, notmuch is a wonderful idea, both the cmdline tool and > the emacs interface! Thanks a lot for writing it, I was really excited > when I read the announcement today. -- 2.11.0 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch