debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-02-17 23:53:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Move search-target logic to `notmuch-search-show-result'

Browse source 
This is a simpler place to do this, since we can avoid any point
motion and hence any save-excursions in
`notmuch-search-process-filter', which in turn lets us put all of the
search-target logic outside of any save-excursions.

`notmuch-search-show-{result,error}' are now responsible for their own
point motion.

`notmuch-search-process-filter' could use some reindentation after
this, but we're about to rewrite it entirely, so we won't bother.
This commit is contained in:
Austin Clements 2012-07-09 17:42:37 -04:00 • committed by David Bremner
parent 9b4361d0fe
commit 17525340a2
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
emacs/notmuch.el
View file

@ -730,8 +730,10 @@ non-authors is found, assume that all of the authors match."
(defun notmuch-search-show-result (thread-id date count authors subject tags) (defun notmuch-search-show-result (thread-id date count authors subject tags)
;; Ignore excluded matches ;; Ignore excluded matches
(unless (eq (aref count 1) ?0) (unless (eq (aref count 1) ?0)
(let ((beg (point)) (let ((beg (point-max))
(tags-str (mapconcat 'identity tags " "))) (tags-str (mapconcat 'identity tags " ")))
(save-excursion
(goto-char beg)
(dolist (spec notmuch-search-result-format) (dolist (spec notmuch-search-result-format)
(notmuch-search-insert-field (car spec) (cdr spec) (notmuch-search-insert-field (car spec) (cdr spec)
date count authors subject tags-str)) date count authors subject tags-str))
@ -739,20 +741,23 @@ non-authors is found, assume that all of the authors match."
(notmuch-search-color-line beg (point) tags) (notmuch-search-color-line beg (point) tags)
(put-text-property beg (point) 'notmuch-search-thread-id thread-id) (put-text-property beg (point) 'notmuch-search-thread-id thread-id)
(put-text-property beg (point) 'notmuch-search-authors authors) (put-text-property beg (point) 'notmuch-search-authors authors)
(put-text-property beg (point) 'notmuch-search-subject subject)))) (put-text-property beg (point) 'notmuch-search-subject subject))
(when (string= thread-id notmuch-search-target-thread)
(setq notmuch-search-target-thread "found")
(goto-char beg)))))
(defun notmuch-search-show-error (string &rest objects) (defun notmuch-search-show-error (string &rest objects)
(save-excursion
(goto-char (point-max))
(insert "Error: Unexpected output from notmuch search:\n") (insert "Error: Unexpected output from notmuch search:\n")
(insert (apply #'format string objects)) (insert (apply #'format string objects))
(insert "\n")) (insert "\n")))
(defun notmuch-search-process-filter (proc string) (defun notmuch-search-process-filter (proc string)
"Process and filter the output of \"notmuch search\"" "Process and filter the output of \"notmuch search\""
(let ((buffer (process-buffer proc)) (let ((buffer (process-buffer proc)))
(found-target nil))
(if (buffer-live-p buffer) (if (buffer-live-p buffer)
(with-current-buffer buffer (with-current-buffer buffer
(save-excursion
(let ((line 0) (let ((line 0)
(more t) (more t)
(inhibit-read-only t) (inhibit-read-only t)
@ -769,13 +774,9 @@ non-authors is found, assume that all of the authors match."
(subject (match-string 5 string)) (subject (match-string 5 string))
(tags (match-string 6 string)) (tags (match-string 6 string))
(tag-list (if tags (save-match-data (split-string tags))))) (tag-list (if tags (save-match-data (split-string tags)))))
(goto-char (point-max))
(if (/= (match-beginning 1) line) (if (/= (match-beginning 1) line)
(notmuch-search-show-error (notmuch-search-show-error
(substring string line (match-beginning 1)))) (substring string line (match-beginning 1))))
(when (string= thread-id notmuch-search-target-thread)
(set 'found-target (point))
(set 'notmuch-search-target-thread "found"))
(notmuch-search-show-result thread-id date count authors subject tag-list) (notmuch-search-show-result thread-id date count authors subject tag-list)
(set 'line (match-end 0))) (set 'line (match-end 0)))
(set 'more nil) (set 'more nil)
@ -784,8 +785,6 @@ non-authors is found, assume that all of the authors match."
(if (< line (length string)) (if (< line (length string))
(setq notmuch-search-process-filter-data (substring string line))) (setq notmuch-search-process-filter-data (substring string line)))
)))) ))))
(if found-target
(goto-char found-target)))
(delete-process proc)))) (delete-process proc))))
(defun notmuch-search-tag-all (&optional tag-changes) (defun notmuch-search-tag-all (&optional tag-changes)