From e395f4507d473c190a649094eaee05bceac17af0 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 4 Jul 2013 23:18:19 +0100 Subject: [PATCH] emacs: hello: make --batch error gracefully Recently notmuch-hello was converted to use batch count. However, it seems that several people run different versions of notmuch-emacs and notmuch-cli so this batch makes emacs fail with an error message if --batch is not available in the CLI. Amended by: db --- emacs/notmuch-hello.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 147c08cc..9db8c993 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -402,8 +402,13 @@ options will be handled as specified for (plist-get options :filter))) "\n"))) - (call-process-region (point-min) (point-max) notmuch-command - t t nil "count" "--batch") + (unless (= (call-process-region (point-min) (point-max) notmuch-command + t t nil "count" "--batch") 0) + (notmuch-logged-error "notmuch count --batch failed" + "Please check that the notmuch CLI is new enough to support `count +--batch'. In general we recommend running matching versions of +the CLI and emacs interface.")) + (goto-char (point-min)) (notmuch-remove-if-not -- 2.43.0