David Edmondson <dme@dme.org> writes: > On Thursday, 2019-11-28 at 08:13:55 -08, 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> >> --- >> emacs/notmuch-tree.el | 17 +++++++++++++---- >> 1 file changed, 13 insertions(+), 4 deletions(-) >> >> diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el >> index 4bc05160..9f2d87b5 100644 >> --- a/emacs/notmuch-tree.el >> +++ b/emacs/notmuch-tree.el >> @@ -577,12 +577,22 @@ 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 (last) >> + (while (and (not (setq last (if prev (bobp) (eobp)))) >> + (not (notmuch-tree-get-match))) >> + (forward-line (if prev -1 nil))) > > A function scope variable to store the direction would save testing > `prev' every time around the loop. > > Same question about the local variable as for the last patch. yup I believe this makes sense, I send out a new version in a bit. > >> + (not last))) >> + >> (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 +600,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.23.0 >> >> _______________________________________________ >> notmuch mailing list >> notmuch@notmuchmail.org >> https://notmuchmail.org/mailman/listinfo/notmuch > > dme. > -- > Oh by the way, which one's Pink? _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch