[PATCH 2/3] test: fix expected output for emacs tests after the wash button label...

diff --git a/5f/3c2d76d676f7108560395ccf1f6c6a0a3d751d b/5f/3c2d76d676f7108560395ccf1f6c6a0a3d751d
new file mode 100644 (file)
index 0000000..154c2e1
--- /dev/null
+++ b/5f/3c2d76d676f7108560395ccf1f6c6a0a3d751d
@@ -0,0 +1,154 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\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 3367C429E27\r
+       for <notmuch@notmuchmail.org>; Sun, 22 May 2011 11:57:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 uh6R8fl8DOYh for <notmuch@notmuchmail.org>;\r
+       Sun, 22 May 2011 11:57:45 -0700 (PDT)\r
+Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com\r
+       [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6D44B429E28\r
+       for <notmuch@notmuchmail.org>; Sun, 22 May 2011 11:57:41 -0700 (PDT)\r
+Received: by mail-fx0-f53.google.com with SMTP id 8so3802481fxm.26\r
+       for <notmuch@notmuchmail.org>; Sun, 22 May 2011 11:57:41 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
+       :in-reply-to:references;\r
+       bh=AXMB+4U9j1VReq/W4smoIoiQcQOUpPG3vvsqjL3ZDhM=;\r
+       b=j6RSTot3WxW89hyp7pdY+gnL51hJuvh/Mf0RCANDjy7rMBCmabLf/NavFH5FXTLlgI\r
+       C+heDNbnfqYuAUkt7ncf+iktd8Q4wWPIkBR6rc4kyZkIGLpnLP7uQ/McT0wU9CN6nTVm\r
+       DiwwH0cGLXj+f1wCQmq28wK8wSTZblhG6L5Fo=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       b=Dc4gSMbO7OYW1ld0UD4eQpbmldq31s65CgAw6SH/H/2ZVLDeEQjOfxR4kaniD7EkEM\r
+       4O8u1t/2nnNkunf4i3lelsAJQGCY4F3M+fLCAvir1GDZsAxHnINCT7nOcEAfoVaakZyn\r
+       bLkuRWIt+PtuJSd0A9VghkxWXILEEvzZjmZ6E=\r
+Received: by 10.223.14.137 with SMTP id g9mr1638260faa.2.1306090661026;\r
+       Sun, 22 May 2011 11:57:41 -0700 (PDT)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id d16sm2062089faa.36.2011.05.22.11.57.40\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 22 May 2011 11:57:40 -0700 (PDT)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] test: fix expected output for emacs tests after the wash\r
+       button label changes\r
+Date: Sun, 22 May 2011 22:57:54 +0400\r
+Message-Id: <1306090675-26982-2-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.5.1\r
+In-Reply-To: <1306090675-26982-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1306090675-26982-1-git-send-email-dmitry.kurochkin@gmail.com>\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: Sun, 22 May 2011 18:57:47 -0000\r
+\r
+---\r
+ .../notmuch-show-thread-maildir-storage            |   18 +++++++++---------\r
+ 1 files changed, 9 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
+index 2f24630..241b5b7 100644\r
+--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
++++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
+@@ -26,7 +26,7 @@ with Maildir) or if something else is going on.\r
+ \r
+ Cheers,\r
+ \r
+-[ 5-line signature. Click/Enter to toggle visibility. ]\r
++[ 5-line signature. Click/Enter to show. ]\r
+ -- \r
+ Lars Kellogg-Stedman <lars@seas.harvard.edu>\r
+ Senior Technologist, Computing and Information Technology\r
+@@ -34,7 +34,7 @@ Harvard University School of Engineering and Applied Sciences\r
+ \r
+ [ application/pgp-signature ]\r
+ [ text/plain ]\r
+-[ 4-line signature. Click/Enter to toggle visibility. ]\r
++[ 4-line signature. Click/Enter to show. ]\r
+ _______________________________________________\r
+ notmuch mailing list\r
+ notmuch@notmuchmail.org\r
+@@ -58,12 +58,12 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+ \r
+  See the patch just posted here.\r
+ \r
+- [ 2-line signature. Click/Enter to toggle visibility. ]\r
++ [ 2-line signature. Click/Enter to show. ]\r
+  -- \r
+  http://fossarchy.blogspot.com/\r
+  [ application/pgp-signature ]\r
+  [ text/plain ]\r
+- [ 4-line signature. Click/Enter to toggle visibility. ]\r
++ [ 4-line signature. Click/Enter to show. ]\r
+  _______________________________________________\r
+  notmuch mailing list\r
+  notmuch@notmuchmail.org\r
+@@ -88,7 +88,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+ \r
+   -- Lars\r
+ \r
+-  [ 5-line signature. Click/Enter to toggle visibility. ]\r
++  [ 5-line signature. Click/Enter to show. ]\r
+   -- \r
+   Lars Kellogg-Stedman <lars@seas.harvard.edu>\r
+   Senior Technologist, Computing and Information Technology\r
+@@ -96,7 +96,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+ \r
+   [ application/pgp-signature ]\r
+   [ text/plain ]\r
+-  [ 4-line signature. Click/Enter to toggle visibility. ]\r
++  [ 4-line signature. Click/Enter to show. ]\r
+   _______________________________________________\r
+   notmuch mailing list\r
+   notmuch@notmuchmail.org\r
+@@ -118,7 +118,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+ \r
+    Just has been pushed\r
+ \r
+-   [ 10-line signature. Click/Enter to toggle visibility. ]\r
++   [ 10-line signature. Click/Enter to show. ]\r
+    -- \r
+    http://fossarchy.blogspot.com/\r
+    -------------- next part --------------\r
+@@ -166,7 +166,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+     The version of lib/messages.cc in your repo doesn't build because it's\r
+     missing "#include <stdint.h>" (for the uint32_t on line 466).\r
+ \r
+-    [ 5-line signature. Click/Enter to toggle visibility. ]\r
++    [ 5-line signature. Click/Enter to show. ]\r
+     -- \r
+     Lars Kellogg-Stedman <lars@seas.harvard.edu>\r
+     Senior Technologist, Computing and Information Technology\r
+@@ -174,7 +174,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+ \r
+     [ application/pgp-signature ]\r
+     [ text/plain ]\r
+-    [ 4-line signature. Click/Enter to toggle visibility. ]\r
++    [ 4-line signature. Click/Enter to show. ]\r
+     _______________________________________________\r
+     notmuch mailing list\r
+     notmuch@notmuchmail.org\r
+-- \r
+1.7.5.1\r
+\r