diff options
| author | William Casarin <jb55@jb55.com> | 2020-04-04 13:41:35 -0700 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-04-06 07:16:58 -0300 |
| commit | 1abe5a0c5b18bdbc0b25f3d138356ee73fe961d1 (patch) | |
| tree | 6f88036c13bc412ae530ccb7039bd0f80d57ba78 | |
| parent | c6f43306ccb35a5e885b186fbf87394d2f036813 (diff) | |
emacs/tree: add notmuch-tree-archive-message-than-next-or-exit
This is the notmuch-tree version of
notmuch-show-archive-message-than-next-or-exit.
Signed-off-by: William Casarin <jb55@jb55.com>
| -rw-r--r-- | emacs/notmuch-tree.el | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index b405e9e3..02bdd1ee 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -617,6 +617,15 @@ message will be \"unarchived\", i.e. the tag changes in (notmuch-tree-archive-message unarchive) (notmuch-tree-next-matching-message)) +(defun notmuch-tree-archive-message-then-next-or-exit () + "Archive current message, then show next open message in current thread. + +If at the last open message in the current thread, then exit back +to search results." + (interactive) + (notmuch-tree-archive-message) + (notmuch-tree-next-matching-message t)) + (defun notmuch-tree-next-message () "Move to next message." (interactive) @@ -643,23 +652,24 @@ nil otherwise." (forward-line dir)) (not (funcall eobfn)))) -(defun notmuch-tree-matching-message (&optional prev) +(defun notmuch-tree-matching-message (&optional prev pop-at-end) "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))) + (if (and (not (notmuch-tree-goto-matching-message prev)) pop-at-end) + (notmuch-tree-quit pop-at-end) + (when (window-live-p notmuch-tree-message-window) + (notmuch-tree-show-message-in)))) -(defun notmuch-tree-prev-matching-message () +(defun notmuch-tree-prev-matching-message (&optional pop-at-end) "Move to previous matching message." - (interactive) - (notmuch-tree-matching-message t)) + (interactive "P") + (notmuch-tree-matching-message t pop-at-end)) -(defun notmuch-tree-next-matching-message () +(defun notmuch-tree-next-matching-message (&optional pop-at-end) "Move to next matching message." - (interactive) - (notmuch-tree-matching-message)) + (interactive "P") + (notmuch-tree-matching-message nil pop-at-end)) (defun notmuch-tree-refresh-view (&optional view) "Refresh view." |
