diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2013-05-31 20:40:05 -0400 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2013-06-01 08:56:16 -0300 |
| commit | 08fde50bf3a4c54f6413aff4052e0d84392463f9 (patch) | |
| tree | 211409ceef966edec6c7e8bb9d58201ccf224104 /emacs | |
| parent | a13b388243247a423a8c8476e35a4ebe6c9bde5b (diff) | |
emacs: Use async process helper for search
Previously, search started the async notmuch process directly. Now,
it uses `notmuch-start-notmuch'. This simplifies the process sentinel
a bit and means that we no longer have to worry about errors
interleaved with the JSON output.
We also update the tests of Emacs error handling, since the error
output is now separated from the search results buffer.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch.el | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 4c1a6cac..b8d9c444 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -653,15 +653,8 @@ of the result." ;; For version mismatch, there's no point in ;; showing the search buffer (when (or (= exit-status 20) (= exit-status 21)) - (kill-buffer)) - (condition-case err - (notmuch-check-async-exit-status proc msg) - ;; Suppress the error signal since strange - ;; things happen if a sentinel signals. Mimic - ;; the top-level's handling of error messages. - (error - (message "%s" (error-message-string err)) - (throw 'return nil))) + (kill-buffer) + (throw 'return nil)) (if (and atbob (not (string= notmuch-search-target-thread "found"))) (set 'never-found-target-thread t))))) @@ -938,10 +931,9 @@ Other optional parameters are used as follows: (erase-buffer) (goto-char (point-min)) (save-excursion - (let ((proc (start-process - "notmuch-search" buffer - notmuch-command "search" - "--format=json" "--format-version=1" + (let ((proc (notmuch-start-notmuch + "notmuch-search" buffer #'notmuch-search-process-sentinel + "search" "--format=json" "--format-version=1" (if oldest-first "--sort=oldest-first" "--sort=newest-first") @@ -951,7 +943,6 @@ Other optional parameters are used as follows: ;; should be called no matter how the process dies. (parse-buf (generate-new-buffer " *notmuch search parse*"))) (process-put proc 'parse-buf parse-buf) - (set-process-sentinel proc 'notmuch-search-process-sentinel) (set-process-filter proc 'notmuch-search-process-filter) (set-process-query-on-exit-flag proc nil)))) (run-hooks 'notmuch-search-hook))) |