On Saturday, 2019-12-28 at 10:01:19 -05, William Casarin wrote: > This function captures some common logic when jumping to matching > messages in notmuch-tree mode. > > We also add a new return value (t or nil), that indicates if there was > a next matching message in the thread to show. > > Signed-off-by: William Casarin <jb55@jb55.com> Reviewed-by: David Edmondson <dme@dme.org> > --- > emacs/notmuch-tree.el | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el > index d262ba26..18fdb1c0 100644 > --- a/emacs/notmuch-tree.el > +++ b/emacs/notmuch-tree.el > @@ -577,12 +577,23 @@ message will be \"unarchived\", i.e. the tag changes in > (when (window-live-p notmuch-tree-message-window) > (notmuch-tree-show-message-in))) > > +(defun notmuch-tree-goto-matching-message (&optional prev) > + "Move to the next or previous matching message. > + > +Returns t if there was a next matching message in the thread to show, > +nil otherwise." > + (let ((dir (if prev -1 nil)) You don't need this final `nil', but it's a real nit ;-) > + (eobfn (if prev #'bobp #'eobp))) > + (while (and (not (funcall eobfn)) > + (not (notmuch-tree-get-match))) > + (forward-line dir)) > + (not (funcall eobfn)))) > + > (defun notmuch-tree-prev-matching-message () > "Move to previous matching message." > (interactive) > (forward-line -1) > - (while (and (not (bobp)) (not (notmuch-tree-get-match))) > - (forward-line -1)) > + (notmuch-tree-goto-matching-message t) > (when (window-live-p notmuch-tree-message-window) > (notmuch-tree-show-message-in))) > > @@ -590,8 +601,7 @@ message will be \"unarchived\", i.e. the tag changes in > "Move to next matching message." > (interactive) > (forward-line) > - (while (and (not (eobp)) (not (notmuch-tree-get-match))) > - (forward-line)) > + (notmuch-tree-goto-matching-message) > (when (window-live-p notmuch-tree-message-window) > (notmuch-tree-show-message-in))) > > -- > 2.24.0 dme. -- You bring light in. _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch