On Saturday, 2019-12-28 at 10:01:20 -05, William Casarin wrote: > 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 <jb55@jb55.com> > --- > 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 18fdb1c0..25d84f45 100644 > --- a/emacs/notmuch-tree.el > +++ b/emacs/notmuch-tree.el > @@ -589,21 +589,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))) > + The naming is getting a bit contorted here. How about renaming the existing `notmuch-tree-goto-matching-message' to something internal, like `notmuch-tree--goto-matching-message-1' and then the new `notmuch-tree-matching-message' to `notmuch-tree-goto-matching-message', to make it clear that the new function moves to a different message. > (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 () > "Refresh view." > -- > 2.24.0 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > https://notmuchmail.org/mailman/listinfo/notmuch dme. -- I'm not living in the real world, no more, no more. _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch