From: Carl Worth Date: Thu, 10 Mar 2011 23:29:24 +0000 (-0800) Subject: emacs: Fix notmuch-search-process-filter to handle incomplete lines X-Git-Tag: debian/0.6_254~174 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8a534dc60d5f4bf579eabda9ae482a1982de3e4e;p=notmuch.git emacs: Fix notmuch-search-process-filter to handle incomplete lines This fixes the recently-added emacs-large-search-buffer test. This is as simple as saving any trailing input and then pre-prepending it on the next call. MAny thanks to Thomas Schwinge for tracking down this problem and contributing a preliminary version of this fix. --- diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 057b1aec..dbf269a5 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -736,6 +736,10 @@ non-authors is found, assume that all of the authors match." do (notmuch-search-insert-field field date count authors subject tags))) (insert "\n")) +(defvar notmuch-search-process-filter-data nil + "Data that has not yet been processed.") +(make-variable-buffer-local 'notmuch-search-process-filter-data) + (defun notmuch-search-process-filter (proc string) "Process and filter the output of \"notmuch search\"" (let ((buffer (process-buffer proc)) @@ -745,7 +749,9 @@ non-authors is found, assume that all of the authors match." (save-excursion (let ((line 0) (more t) - (inhibit-read-only t)) + (inhibit-read-only t) + (string (concat notmuch-search-process-filter-data string))) + (setq notmuch-search-process-filter-data nil) (while more (while (and (< line (length string)) (= (elt string line) ?\n)) (setq line (1+ line))) @@ -775,7 +781,7 @@ non-authors is found, assume that all of the authors match." (while (and (< line (length string)) (= (elt string line) ?\n)) (setq line (1+ line))) (if (< line (length string)) - (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line) "\n"))) + (setq notmuch-search-process-filter-data (substring string line))) )))) (if found-target (goto-char found-target)))