test: Updated the expected output to match the newly enabled text/plain hooks.

3 files changed, 48 insertions, 51 deletions

diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage
index 8ba64b27..cdbfa1d7 100644
--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage
+++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage
@@ -26,12 +26,11 @@ with Maildir) or if something else is going on.
 
 Cheers,
 
-[ 5-line signature. Click/Enter to show. ]
+[ 4-line signature. Click/Enter to show. ]
 -- 
 Lars Kellogg-Stedman <lars@seas.harvard.edu>
 Senior Technologist, Computing and Information Technology
 Harvard University School of Engineering and Applied Sciences
-
 [ application/pgp-signature ]
 [ text/plain ]
 [ 4-line signature. Click/Enter to show. ]
@@ -48,12 +47,14 @@ http://notmuchmail.org/mailman/listinfo/notmuch
  [ multipart/signed ]
  [ text/plain ]
 
- Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did gyre and gimble:
+ Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
+ gyre and gimble:
 
   LK> Resulted in 4604 lines of errors along the lines of:
 
   LK>   Error opening
-  LK>   /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
+  LK>  
+ /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
   LK>   Too many open files
 
  See the patch just posted here.
@@ -88,12 +89,11 @@ http://notmuchmail.org/mailman/listinfo/notmuch
 
   -- Lars
 
-  [ 5-line signature. Click/Enter to show. ]
+  [ 4-line signature. Click/Enter to show. ]
   -- 
   Lars Kellogg-Stedman <lars@seas.harvard.edu>
   Senior Technologist, Computing and Information Technology
   Harvard University School of Engineering and Applied Sciences
-
   [ application/pgp-signature ]
   [ text/plain ]
   [ 4-line signature. Click/Enter to show. ]
@@ -106,8 +106,8 @@ http://notmuchmail.org/mailman/listinfo/notmuch
    To: notmuch@notmuchmail.org
    Date: Wed, 18 Nov 2009 02:50:48 +0600
 
-
-   Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu did gyre and gimble:
+   Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu
+   did gyre and gimble:
 
     LK> Is the list archived anywhere?  The obvious archives
     LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available, and I
@@ -127,14 +127,15 @@ http://notmuchmail.org/mailman/listinfo/notmuch
    Type: application/pgp-signature
    Size: 834 bytes
    Desc: not available
-   URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d964/attachment.pgp>
-
+   URL:
+   <http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d964/attachment.pgp>
    Keith Packard <keithp@keithp.com> (2009-11-17) (inbox unread)
    Subject: [notmuch] Working with Maildir storage?
    To: notmuch@notmuchmail.org
    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:
+   On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at
+   seas.harvard.edu> wrote:
    > > See the patch just posted here.
 
    I've also pushed a slightly more complicated (and complete) fix to my
@@ -150,7 +151,6 @@ http://notmuchmail.org/mailman/listinfo/notmuch
    Thanks to everyone for trying out notmuch!
 
    -keith
-
     Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (inbox signed unread)
     Subject: Re: [notmuch] Working with Maildir storage?
     To: Keith Packard <keithp@keithp.com>
@@ -166,12 +166,11 @@ http://notmuchmail.org/mailman/listinfo/notmuch
     The version of lib/messages.cc in your repo doesn't build because it's
     missing "#include <stdint.h>" (for the uint32_t on line 466).
 
-    [ 5-line signature. Click/Enter to show. ]
+    [ 4-line signature. Click/Enter to show. ]
     -- 
     Lars Kellogg-Stedman <lars@seas.harvard.edu>
     Senior Technologist, Computing and Information Technology
     Harvard University School of Engineering and Applied Sciences
-
     [ application/pgp-signature ]
     [ text/plain ]
     [ 4-line signature. Click/Enter to show. ]
@@ -184,7 +183,8 @@ http://notmuchmail.org/mailman/listinfo/notmuch
  To: notmuch@notmuchmail.org
  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:
+ 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).
@@ -195,7 +195,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:
+ > /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
  >   Too many open files
 
  Sadly, the lwn article coincided with me having just introduced this
@@ -212,4 +212,3 @@ http://notmuchmail.org/mailman/listinfo/notmuch
  Happy hacking,
 
  -Carl
-
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 41e2aaa3..b0bf93ed 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
@@ -26,12 +26,11 @@ with Maildir) or if something else is going on.
 
 Cheers,
 
-[ 5-line signature. Click/Enter to show. ]
+[ 4-line signature. Click/Enter to show. ]
 -- 
 Lars Kellogg-Stedman <lars@seas.harvard.edu>
 Senior Technologist, Computing and Information Technology
 Harvard University School of Engineering and Applied Sciences
-
 [ application/pgp-signature ]
 [ text/plain ]
 [ 4-line signature. Click/Enter to show. ]
@@ -48,12 +47,14 @@ http://notmuchmail.org/mailman/listinfo/notmuch
     [ multipart/signed ]
     [ text/plain ]
 
-    Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did gyre and gimble:
+    Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
+    gyre and gimble:
 
      LK> Resulted in 4604 lines of errors along the lines of:
 
      LK>   Error opening
-     LK>   /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
+     LK>  
+    /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
      LK>   Too many open files
 
     See the patch just posted here.
@@ -88,12 +89,11 @@ http://notmuchmail.org/mailman/listinfo/notmuch
 
 	-- Lars
 
-	[ 5-line signature. Click/Enter to show. ]
+	[ 4-line signature. Click/Enter to show. ]
 	-- 
 	Lars Kellogg-Stedman <lars@seas.harvard.edu>
 	Senior Technologist, Computing and Information Technology
 	Harvard University School of Engineering and Applied Sciences
-
 	[ application/pgp-signature ]
 	[ text/plain ]
 	[ 4-line signature. Click/Enter to show. ]
@@ -106,8 +106,8 @@ http://notmuchmail.org/mailman/listinfo/notmuch
 	    To: notmuch@notmuchmail.org
 	    Date: Wed, 18 Nov 2009 02:50:48 +0600
 
-
-	    Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu did gyre and gimble:
+	    Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu
+	    did gyre and gimble:
 
 	     LK> Is the list archived anywhere?  The obvious archives
 	     LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available, and I
@@ -127,14 +127,15 @@ http://notmuchmail.org/mailman/listinfo/notmuch
 	    Type: application/pgp-signature
 	    Size: 834 bytes
 	    Desc: not available
-	    URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d964/attachment.pgp>
-
+	    URL:
+	    <http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d964/attachment.pgp>
             Keith Packard <keithp@keithp.com> (2009-11-17) (inbox unread)
 	    Subject: [notmuch] Working with Maildir storage?
 	    To: notmuch@notmuchmail.org
 	    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:
+	    On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at
+	    seas.harvard.edu> wrote:
 	    > > See the patch just posted here.
 
 	    I've also pushed a slightly more complicated (and complete) fix to my
@@ -150,7 +151,6 @@ http://notmuchmail.org/mailman/listinfo/notmuch
 	    Thanks to everyone for trying out notmuch!
 
 	    -keith
-
                 Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (inbox signed unread)
 		Subject: Re: [notmuch] Working with Maildir storage?
 		To: Keith Packard <keithp@keithp.com>
@@ -166,12 +166,11 @@ http://notmuchmail.org/mailman/listinfo/notmuch
 		The version of lib/messages.cc in your repo doesn't build because it's
 		missing "#include <stdint.h>" (for the uint32_t on line 466).
 
-		[ 5-line signature. Click/Enter to show. ]
+		[ 4-line signature. Click/Enter to show. ]
 		-- 
 		Lars Kellogg-Stedman <lars@seas.harvard.edu>
 		Senior Technologist, Computing and Information Technology
 		Harvard University School of Engineering and Applied Sciences
-
 		[ application/pgp-signature ]
 		[ text/plain ]
 		[ 4-line signature. Click/Enter to show. ]
@@ -184,7 +183,8 @@ http://notmuchmail.org/mailman/listinfo/notmuch
     To: notmuch@notmuchmail.org
     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:
+    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).
@@ -195,7 +195,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:
+    > /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
     >   Too many open files
 
     Sadly, the lwn article coincided with me having just introduced this
@@ -212,4 +212,3 @@ http://notmuchmail.org/mailman/listinfo/notmuch
     Happy hacking,
 
     -Carl
-
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 fa2108ef..08de8b5d 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
@@ -26,12 +26,11 @@ with Maildir) or if something else is going on.
 
 Cheers,
 
-[ 5-line signature. Click/Enter to show. ]
+[ 4-line signature. Click/Enter to show. ]
 -- 
 Lars Kellogg-Stedman <lars@seas.harvard.edu>
 Senior Technologist, Computing and Information Technology
 Harvard University School of Engineering and Applied Sciences
-
 [ application/pgp-signature ]
 [ text/plain ]
 [ 4-line signature. Click/Enter to show. ]
@@ -48,12 +47,14 @@ Date: Wed, 18 Nov 2009 01:02:38 +0600
 [ multipart/signed ]
 [ text/plain ]
 
-Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did gyre and gimble:
+Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did
+gyre and gimble:
 
  LK> Resulted in 4604 lines of errors along the lines of:
 
  LK>   Error opening
- LK>   /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
+ LK>  
+/home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
  LK>   Too many open files
 
 See the patch just posted here.
@@ -88,12 +89,11 @@ It doesn't look like the patch is in git yet.
 
 -- Lars
 
-[ 5-line signature. Click/Enter to show. ]
+[ 4-line signature. Click/Enter to show. ]
 -- 
 Lars Kellogg-Stedman <lars@seas.harvard.edu>
 Senior Technologist, Computing and Information Technology
 Harvard University School of Engineering and Applied Sciences
-
 [ application/pgp-signature ]
 [ text/plain ]
 [ 4-line signature. Click/Enter to show. ]
@@ -106,8 +106,8 @@ Subject: [notmuch] Working with Maildir storage?
 To: notmuch@notmuchmail.org
 Date: Wed, 18 Nov 2009 02:50:48 +0600
 
-
-Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu did gyre and gimble:
+Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu
+did gyre and gimble:
 
  LK> Is the list archived anywhere?  The obvious archives
  LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available, and I
@@ -127,14 +127,15 @@ Name: not available
 Type: application/pgp-signature
 Size: 834 bytes
 Desc: not available
-URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d964/attachment.pgp>
-
+URL:
+<http://notmuchmail.org/pipermail/notmuch/attachments/20091118/0e33d964/attachment.pgp>
 Keith Packard <keithp@keithp.com> (2009-11-17) (inbox unread)
 Subject: [notmuch] Working with Maildir storage?
 To: notmuch@notmuchmail.org
 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:
+On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at
+seas.harvard.edu> wrote:
 > > See the patch just posted here.
 
 I've also pushed a slightly more complicated (and complete) fix to my
@@ -150,7 +151,6 @@ Barcelona today and so it won't get fixed for a while.
 Thanks to everyone for trying out notmuch!
 
 -keith
-
 Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-18) (inbox signed unread)
 Subject: Re: [notmuch] Working with Maildir storage?
 To: Keith Packard <keithp@keithp.com>
@@ -166,12 +166,11 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500
 The version of lib/messages.cc in your repo doesn't build because it's
 missing "#include <stdint.h>" (for the uint32_t on line 466).
 
-[ 5-line signature. Click/Enter to show. ]
+[ 4-line signature. Click/Enter to show. ]
 -- 
 Lars Kellogg-Stedman <lars@seas.harvard.edu>
 Senior Technologist, Computing and Information Technology
 Harvard University School of Engineering and Applied Sciences
-
 [ application/pgp-signature ]
 [ text/plain ]
 [ 4-line signature. Click/Enter to show. ]
@@ -184,7 +183,8 @@ Subject: [notmuch] Working with Maildir storage?
 To: notmuch@notmuchmail.org
 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:
+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).
@@ -195,7 +195,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:
+> /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
 >   Too many open files
 
 Sadly, the lwn article coincided with me having just introduced this
@@ -212,4 +212,3 @@ likes the best.
 Happy hacking,
 
 -Carl
-