--- /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 479F6431FD7\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:37 -0800 (PST)\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 IWYJEpgXhICr for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Dec 2012 12:04:35 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 0A0F4431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:34 -0800 (PST)\r
+X-AuditID: 12074424-b7fe06d0000008f0-e7-50ccd7d2e158\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id F0.64.02288.2D7DCC05; Sat, 15 Dec 2012 15:04:34 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qBFK4WeL022934; \r
+ Sat, 15 Dec 2012 15:04:32 -0500\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBFK4TMT025686\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 15 Dec 2012 15:04:31 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TjxyG-0007se-Py; Sat, 15 Dec 2012 15:04:28 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 6/7] emacs: Use unified error handling in search\r
+Date: Sat, 15 Dec 2012 15:04:19 -0500\r
+Message-Id: <1355601860-30121-7-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
+References: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixCmqrXvp+pkAg5kbFC1Wz+WxuH5zJrPF\r
+ m5XzWB2YPXbOusvucfjrQhaPZ6tuMQcwR3HZpKTmZJalFunbJXBlrP/KV/BesmLNjXnsDYzH\r
+ RboYOTgkBEwkuj9odjFyApliEhfurWfrYuTiEBLYxyixcPNeKGcDo8T3T4eZIZxHTBI7dl1j\r
+ hXDmMkqceH6RDaSfTUBDYtv+5YwgtoiAtMTOu7NZQWxmgTiJLVP+g8WFBZwlXr9oA4uzCKhK\r
+ LFrQxQJi8wo4SLxYt5AN4g5Fie5nE8BsTgFHiYmTdzGB2EJANbcXzGGawMi/gJFhFaNsSm6V\r
+ bm5iZk5xarJucXJiXl5qka65Xm5miV5qSukmRlBosbuo7GBsPqR0iFGAg1GJh3dHxOkAIdbE\r
+ suLK3EOMkhxMSqK8GZfPBAjxJeWnVGYkFmfEF5XmpBYfYpTgYFYS4U2aD5TjTUmsrEotyodJ\r
+ SXOwKInzXk+56S8kkJ5YkpqdmlqQWgSTleHgUJLgnXoNqFGwKDU9tSItM6cEIc3EwQkynAdo\r
+ eDdIDW9xQWJucWY6RP4Uo6KUOO9CkIQASCKjNA+uFxb7rxjFgV4R5t0CUsUDTBtw3a+ABjMB\r
+ DV5uAza4JBEhJdXAaKQcz/1xr2CsRk/pxs1veHTYauz3+Bnfagn7HKp1IojtRRvj3nD9c7pC\r
+ ugfOSfxKna77YsF38zL73Vvnck3IljAx33so69iq7LwNna+rJna++7d8/pHtnQ0dPxPtOzaw\r
+ HIp4/GNi3pbzLR8rr/19uuN7R7Wn0K55M/+9m2GfmKNS9nzWiWSFnUosxRmJhlrMRcWJAFZq\r
+ EKDYAgAA\r
+Cc: tomi.ollila@iki.fi\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, 15 Dec 2012 20:04:38 -0000\r
+\r
+This slightly changes the output of an existing test since we now\r
+report non-zero exits with a pop-up buffer instead of at the end of\r
+the search results.\r
+---\r
+ emacs/notmuch-lib.el | 13 +++++++++++++\r
+ emacs/notmuch.el | 13 ++++++++-----\r
+ test/emacs-large-search-buffer | 2 +-\r
+ 3 files changed, 22 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 7f7022a..8f84087 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -334,6 +334,19 @@ the user dismisses it."\r
+ (insert "\n"))))\r
+ (pop-to-buffer buf)))\r
+ \r
++(defun notmuch-check-async-exit-status (proc msg)\r
++ "If PROC exited abnormally, pop up an error buffer and signal an error.\r
++\r
++This is a wrapper around `notmuch-check-exit-status' for\r
++asynchronous process sentinels. PROC and MSG must be the\r
++arguments passed to the sentinel."\r
++ (let ((exit-status\r
++ (case (process-status proc)\r
++ ((exit) (process-exit-status proc))\r
++ ((signal) msg))))\r
++ (when exit-status\r
++ (notmuch-check-exit-status exit-status (process-command proc)))))\r
++\r
+ (defun notmuch-check-exit-status (exit-status command &optional output err-file)\r
+ "If EXIT-STATUS is non-zero, pop up an error buffer and signal an error.\r
+ \r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 9da8df4..b0fd387 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -638,6 +638,7 @@ of the result."\r
+ (exit-status (process-exit-status proc))\r
+ (never-found-target-thread nil))\r
+ (when (memq status '(exit signal))\r
++ (catch 'return\r
+ (kill-buffer (process-get proc 'parse-buf))\r
+ (if (buffer-live-p buffer)\r
+ (with-current-buffer buffer\r
+@@ -648,17 +649,19 @@ of the result."\r
+ (if (eq status 'signal)\r
+ (insert "Incomplete search results (search process was killed).\n"))\r
+ (when (eq status 'exit)\r
+- (insert "End of search results.")\r
+- (unless (= exit-status 0)\r
+- (insert (format " (process returned %d)" exit-status)))\r
+- (insert "\n")\r
++ (insert "End of search results.\n")\r
++ (condition-case nil\r
++ (notmuch-check-async-exit-status proc msg)\r
++ ;; Suppress the error signal since strange\r
++ ;; things happen if a sentinel signals.\r
++ (error (throw 'return nil)))\r
+ (if (and atbob\r
+ (not (string= notmuch-search-target-thread "found")))\r
+ (set 'never-found-target-thread t)))))\r
+ (when (and never-found-target-thread\r
+ notmuch-search-target-line)\r
+ (goto-char (point-min))\r
+- (forward-line (1- notmuch-search-target-line))))))))\r
++ (forward-line (1- notmuch-search-target-line)))))))))\r
+ \r
+ (defcustom notmuch-search-line-faces '(("unread" :weight bold)\r
+ ("flagged" :foreground "blue"))\r
+diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer\r
+index 678328d..9dcbef5 100755\r
+--- a/test/emacs-large-search-buffer\r
++++ b/test/emacs-large-search-buffer\r
+@@ -36,7 +36,7 @@ test_emacs '(notmuch-search "--this-option-does-not-exist")\r
+ cat <<EOF >EXPECTED\r
+ Error: Unexpected output from notmuch search:\r
+ Unrecognized option: --this-option-does-not-exist\r
+-End of search results. (process returned 1)\r
++End of search results.\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff