--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 1AE86431FC2\r
+ for <notmuch@notmuchmail.org>; Fri, 17 May 2013 21:32:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[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 G7OiS-vb2eDs for <notmuch@notmuchmail.org>;\r
+ Fri, 17 May 2013 21:32:21 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+ [18.9.25.12])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9DEF1431FD2\r
+ for <notmuch@notmuchmail.org>; Fri, 17 May 2013 21:32:15 -0700 (PDT)\r
+X-AuditID: 1209190c-b7f566d000004c69-68-5197044fa575\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id EE.94.19561.F4407915; Sat, 18 May 2013 00:32:15 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH-1.MIT.EDU [18.9.28.11])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r4I4WDV1016938; \r
+ Sat, 18 May 2013 00:32:13 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r4I4WBi5018831\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 18 May 2013 00:32:12 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1UdYo1-0001Yu-Ij; Sat, 18 May 2013 00:31:41 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/5] test: Remove extraneous Emacs error handling test\r
+Date: Sat, 18 May 2013 00:31:08 -0400\r
+Message-Id: <1368851472-5382-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1368851472-5382-1-git-send-email-amdragon@mit.edu>\r
+References: <1368851472-5382-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6nouvPMj3QoOuClMXquTwW12/OZHZg\r
+ 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MiZP/c1SsJyj4symFywNjL/Yuhg5OSQETCRa\r
+ /u5igbDFJC7cWw8U5+IQEtjHKHF9/TFmCGcjo0Tz6XlgVUICd5gkWl4nQSTmMkr8edXMDJJg\r
+ E9CQ2LZ/OSOILSIgLbHz7mxWEJtZwFHi8/5FYOuEBdwkDh9+wg5iswioSmy/fxvM5hWwl2i4\r
+ c54V4gxFie5nE8DqOQUcJA7PP8YGsdheouvCTbYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm\r
+ 5aUW6Rrq5WaW6KWmlG5iBAUSpyTPDsY3B5UOMQpwMCrx8H5wnRYoxJpYVlyZe4hRkoNJSZTX\r
+ 5B9QiC8pP6UyI7E4I76oNCe1+BCjBAezkgjv82KgHG9KYmVValE+TEqag0VJnPdyyk1/IYH0\r
+ xJLU7NTUgtQimKwMB4eSBK8u8/RAIcGi1PTUirTMnBKENBMHJ8hwHqDhViA1vMUFibnFmekQ\r
+ +VOMilLivM4gCQGQREZpHlwvLNJfMYoDvSLMKw1SxQNMEnDdr4AGMwENZr02FWRwSSJCSqqB\r
+ caFf98R/Hhmef3ay8a0+JT/N3eWE+fdFGxZfM5x+4XnPn3NeifE6Fv2/3qgdO8w17Ueb9RJ1\r
+ Vl6R4/Uxibs3HhSrWT9lWunVJqfGn1NmPezOuVaubXinOrbU7wyrs9RVqXnuLWG3+6eY/Jt3\r
+ fA8L0yW7RIXLHuKP1ONjz8ufM3PrslO4mze7VImlOCPRUIu5qDgRANfrnQ/PAgAA\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: Sat, 18 May 2013 04:32:27 -0000\r
+\r
+We now check error handling more carefully in the last test in\r
+test/emacs and we're about to add more error handling tests. (This\r
+was also a strange place for this test, since it had nothing to do\r
+with large search buffers.)\r
+---\r
+ test/emacs-large-search-buffer | 11 -----------\r
+ 1 file changed, 11 deletions(-)\r
+\r
+diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer\r
+index 9dcbef5..8b1251f 100755\r
+--- a/test/emacs-large-search-buffer\r
++++ b/test/emacs-large-search-buffer\r
+@@ -29,15 +29,4 @@ test_emacs '(notmuch-search "*")\r
+ sed -i -e s', *, ,g' -e 's/xxx*/[BLOB]/g' OUTPUT\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-test_begin_subtest "Ensure that emacs doesn't drop error messages"\r
+-test_emacs '(notmuch-search "--this-option-does-not-exist")\r
+- (notmuch-test-wait)\r
+- (test-output)'\r
+-cat <<EOF >EXPECTED\r
+-Error: Unexpected output from notmuch search:\r
+-Unrecognized option: --this-option-does-not-exist\r
+-End of search results.\r
+-EOF\r
+-test_expect_equal_file OUTPUT EXPECTED\r
+-\r
+ test_done\r
+-- \r
+1.7.10.4\r
+\r