From: David Bremner Date: Sat, 8 Feb 2014 14:25:17 +0000 (-0400) Subject: emacs: remove newlines from input to notmuch count --batch X-Git-Tag: 0.18_rc0~130 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/75d84dfd8417eacac4e8586d6d1d4d2728717d07 emacs: remove newlines from input to notmuch count --batch Since a newline starts a new query in batch mode, this causes mysterious crashes in the emacs interface if saved searches contain newlines. See the discussion at id:87wqhcxb5j.fsf@maritornes.cs.unb.ca In general newlines seem to be just whitespace to the xapian query parser, so this should be mainly harmless. --- diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 7b3d76b7..e325cd3b 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -399,10 +399,12 @@ options will be handled as specified for (third elem) (cdr elem)))) (insert - (notmuch-hello-filtered-query count-query - (or (plist-get options :filter-count) - (plist-get options :filter))) - "\n"))) + (replace-regexp-in-string + "\n" " " + (notmuch-hello-filtered-query count-query + (or (plist-get options :filter-count) + (plist-get options :filter)))) + "\n"))) (unless (= (call-process-region (point-min) (point-max) notmuch-command t t nil "count" "--batch") 0)