[PATCH 4/7] emacs: Improve error handling for notmuch-call-notmuch-json
Austin Clements
amdragon at MIT.EDU
Fri Dec 14 21:15:10 PST 2012
This checks for non-zero exit status from JSON CLI calls and pops up
an error buffer with stderr and stdout. A consequence of this is that
show and reply now handle errors, rather than ignoring them.
---
emacs/notmuch-lib.el | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 4b71116..9222de8 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -373,15 +373,23 @@ contents of ERR-FILE will be included in the error message."
"Invoke `notmuch-command' with `args' and return the parsed JSON output.
The returned output will represent objects using property lists
-and arrays as lists."
+and arrays as lists. If notmuch exits with a non-zero status,
+this will pop up a buffer containing notmuch's output and signal
+an error."
(with-temp-buffer
- (apply #'call-process notmuch-command nil (list t nil) nil args)
- (goto-char (point-min))
- (let ((json-object-type 'plist)
- (json-array-type 'list)
- (json-false 'nil))
- (json-read))))
+ (let ((err-file (make-temp-file "nmerr")))
+ (unwind-protect
+ (let ((status (apply #'call-process
+ notmuch-command nil (list t err-file) nil args)))
+ (notmuch-check-exit-status status (cons notmuch-command args)
+ (buffer-string) err-file)
+ (goto-char (point-min))
+ (let ((json-object-type 'plist)
+ (json-array-type 'list)
+ (json-false 'nil))
+ (json-read)))
+ (delete-file err-file)))))
;; Compatibility functions for versions of emacs before emacs 23.
;;
--
1.7.10.4
More information about the notmuch
mailing list