diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2012-12-15 22:17:28 -0500 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2012-12-16 17:22:14 -0400 |
| commit | 0df6dcfe7631b032e26c15ebb9627b3699200022 (patch) | |
| tree | cd8f1cdeb17db8dd5a2237ffbeb3db558bff7628 /emacs/notmuch-lib.el | |
| parent | e723e21f75ed1f7c18de015f3913cb25d1b19f46 (diff) | |
emacs: Special handling for version mismatch errors
Since Emacs has more semantic information, we suppress the generic
format version error from the CLI and give a more informative error.
Diffstat (limited to 'emacs/notmuch-lib.el')
| -rw-r--r-- | emacs/notmuch-lib.el | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 8e754edf..77a591d8 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -360,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 |