(put-text-property pos next 'face (cons face cur))
(setq pos next)))))
+(defun notmuch-pop-up-error (msg)
+ "Pop up an error buffer displaying MSG.
+
+This will accumulate error messages in the errors buffer until
+the user dismisses it."
+
+ (let ((buf (get-buffer-create "*Notmuch errors*")))
+ (with-current-buffer buf
+ (view-mode-enter nil #'kill-buffer)
+ (let ((inhibit-read-only t))
+ (goto-char (point-max))
+ (unless (bobp)
+ (insert "\n"))
+ (insert msg)
+ (unless (bolp)
+ (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.
+
+If EXIT-STATUS is non-zero, pop up a notmuch error buffer
+describing the error and signal an Elisp error. EXIT-STATUS must
+be a number indicating the exit status code of a process or a
+string describing the signal that terminated the process (such as
+returned by `call-process'). COMMAND must be a list giving the
+command and its arguments. OUTPUT, if provided, is a string
+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."
+
+ (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
+ (format "Error invoking notmuch. %s exited with %s%s.\n"
+ (mapconcat #'identity command " ")
+ ;; Signal strings look like "Terminated", hence the
+ ;; colon.
+ (if (integerp exit-status) "status " "signal: ")
+ exit-status)
+ (when err-file
+ (concat "Error:\n"
+ (with-temp-buffer
+ (insert-file-contents err-file)
+ (if (eobp)
+ "(no error output)\n"
+ (buffer-string)))))
+ (when (and output (not (equal output "")))
+ (format "Output:\n%s" output))))
+ ;; Mimic `process-lines'
+ (error "%s exited with status %s" (car command) exit-status))))
+
+(defun notmuch-call-notmuch-json (&rest args)
+ "Invoke `notmuch-command' with `args' and return the parsed JSON output.
+
+The returned output will represent objects using property 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
+ (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.
;;
;; Both functions here were copied from emacs 23 with the following copyright:
projects / notmuch / blobdiff