diff options
| author |  David Bremner <david@tethera.net> | 2014-02-08 10:25:17 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2014-02-25 20:53:19 -0400 |
| commit | 75d84dfd8417eacac4e8586d6d1d4d2728717d07 (patch) | |
| tree | 469f660ca26dc9c6cc2aa3c501ddb7e0396991eb /emacs | |
| parent | fa27d0faa057775fe709dc2d3d0eb1ee5654512a (diff) | |
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.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-hello.el | 10 |
1 files changed, 6 insertions, 4 deletions
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) |