X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-lib.el;h=77a591d89ede485c0fbd3318511fbf71b028d338;hb=27dacc7947309bb8f6f84b2cd83dc7ec280576b2;hp=dd2c78baeca928b1b8e239e1e2484d4068de49ac;hpb=e1d5e881568afd6bcdc145a7f035e207f8ff3884;p=notmuch diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index dd2c78ba..77a591d8 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -334,6 +334,19 @@ the user dismisses it." (insert "\n")))) (pop-to-buffer buf))) +(defun notmuch-check-async-exit-status (proc msg) + "If PROC exited abnormally, pop up an error buffer and signal an error. + +This is a wrapper around `notmuch-check-exit-status' for +asynchronous process sentinels. PROC and MSG must be the +arguments passed to the sentinel." + (let ((exit-status + (case (process-status proc) + ((exit) (process-exit-status proc)) + ((signal) msg)))) + (when exit-status + (notmuch-check-exit-status exit-status (process-command proc))))) + (defun notmuch-check-exit-status (exit-status command &optional output err-file) "If EXIT-STATUS is non-zero, pop up an error buffer and signal an error. @@ -347,9 +360,18 @@ giving the output of command. ERR-FILE, if provided, is the name of a file containing the error output of command. OUTPUT and the contents of ERR-FILE will be included in the error message." - ;; This is implemented as a cond to make it easy to expand. (cond ((eq exit-status 0) t) + ((eq exit-status 20) + (notmuch-pop-up-error "Error: Version mismatch. +Emacs requested an older output format than supported by the notmuch CLI. +You may need to restart Emacs or upgrade your notmuch Emacs package.") + (error "notmuch CLI version mismatch")) + ((eq exit-status 21) + (notmuch-pop-up-error "Error: Version mismatch. +Emacs requested a newer output format than supported by the notmuch CLI. +You may need to restart Emacs or upgrade your notmuch package.") + (error "notmuch CLI version mismatch")) (t (notmuch-pop-up-error (concat