From d9888b301c6e619daaa6e507c343af0ffc726b16 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 4 Apr 2020 13:41:33 -0700 Subject: [PATCH] emacs/tree: add notmuch-tree-matching-message This functions removes some duplicate logic between notmuch-tree-{next,prev}-matching-message We do this because we will be adding some additional logic similar to the notmuch-show-next-open-message function, and it will help if this logic is all in one place. Signed-off-by: William Casarin --- emacs/notmuch-tree.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index 7f68efba..e6a6e67f 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -643,21 +643,23 @@ nil otherwise." (forward-line dir)) (not (funcall eobfn)))) +(defun notmuch-tree-matching-message (&optional prev) + "Move to the next or previous matching message" + (interactive "P") + (forward-line (if prev -1 nil)) + (notmuch-tree-goto-matching-message prev) + (when (window-live-p notmuch-tree-message-window) + (notmuch-tree-show-message-in))) + (defun notmuch-tree-prev-matching-message () "Move to previous matching message." (interactive) - (forward-line -1) - (notmuch-tree-goto-matching-message t) - (when (window-live-p notmuch-tree-message-window) - (notmuch-tree-show-message-in))) + (notmuch-tree-matching-message t)) (defun notmuch-tree-next-matching-message () "Move to next matching message." (interactive) - (forward-line) - (notmuch-tree-goto-matching-message) - (when (window-live-p notmuch-tree-message-window) - (notmuch-tree-show-message-in))) + (notmuch-tree-matching-message)) (defun notmuch-tree-refresh-view (&optional view) "Refresh view."