debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: break out thread navigation from notmuch-show-archive-thread

Browse source 
This function is now just for archiving the current thread.  A new
function is created to archive-then-next.  The 'a' key binding is
updated accordingly.

This will allow people to bind to the simple thread archiving function
without the extra navigation.  The archive-thread function now also
takes a prefix to unarchive the current thread (ie. put the whole
thread back in the inbox).
This commit is contained in:
Jameson Graef Rollins 2012-01-24 16:06:18 -08:00 committed by David Bremner
parent 047792102c
commit be05158b69
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
emacs/notmuch-show.el
View file

@ -1076,7 +1076,7 @@ thread id. If a prefix is given, crypto processing is toggled."
(define-key map "-" 'notmuch-show-remove-tag) (define-key map "-" 'notmuch-show-remove-tag)
(define-key map "+" 'notmuch-show-add-tag) (define-key map "+" 'notmuch-show-add-tag)
(define-key map "x" 'notmuch-show-archive-thread-then-exit) (define-key map "x" 'notmuch-show-archive-thread-then-exit)
(define-key map "a" 'notmuch-show-archive-thread) (define-key map "a" 'notmuch-show-archive-thread-then-next)
(define-key map "N" 'notmuch-show-next-message) (define-key map "N" 'notmuch-show-next-message)
(define-key map "P" 'notmuch-show-previous-message) (define-key map "P" 'notmuch-show-previous-message)
(define-key map "n" 'notmuch-show-next-open-message) (define-key map "n" 'notmuch-show-next-open-message)
@ -1336,7 +1336,7 @@ thread from the search from which this thread was originally
shown." shown."
(interactive) (interactive)
(if (notmuch-show-advance) (if (notmuch-show-advance)
(notmuch-show-archive-thread))) (notmuch-show-archive-thread-then-next)))
(defun notmuch-show-rewind () (defun notmuch-show-rewind ()
"Backup through the thread, (reverse scrolling compared to \\[notmuch-show-advance-and-archive]). "Backup through the thread, (reverse scrolling compared to \\[notmuch-show-advance-and-archive]).
@ -1590,8 +1590,12 @@ added."
(if show-next (if show-next
(notmuch-search-show-thread))))) (notmuch-search-show-thread)))))
(defun notmuch-show-archive-thread () (defun notmuch-show-archive-thread (&optional unarchive)
"Archive each message in thread, then show next thread from search. "Archive each message in thread.
If a prefix argument is given, the messages will be
\"unarchived\" (ie. the \"inbox\" tag will be added instead of
removed).
Archive each message currently shown by removing the \"inbox\" Archive each message currently shown by removing the \"inbox\"
tag from each. Then kill this buffer and show the next thread tag from each. Then kill this buffer and show the next thread
@ -1601,14 +1605,21 @@ Note: This command is safe from any race condition of new messages
being delivered to the same thread. It does not archive the being delivered to the same thread. It does not archive the
entire thread, but only the messages shown in the current entire thread, but only the messages shown in the current
buffer." buffer."
(interactive "P")
(if unarchive
(notmuch-show-add-tag-thread "inbox")
(notmuch-show-remove-tag-thread "inbox")))
(defun notmuch-show-archive-thread-then-next ()
"Archive each message in thread, then show next thread from search."
(interactive) (interactive)
(notmuch-show-remove-tag-thread "inbox") (notmuch-show-archive-thread)
(notmuch-show-next-thread t)) (notmuch-show-next-thread t))
(defun notmuch-show-archive-thread-then-exit () (defun notmuch-show-archive-thread-then-exit ()
"Archive each message in thread, then exit back to search results." "Archive each message in thread, then exit back to search results."
(interactive) (interactive)
(notmuch-show-remove-tag-thread "inbox") (notmuch-show-archive-thread)
(notmuch-show-next-thread)) (notmuch-show-next-thread))
(defun notmuch-show-stash-cc () (defun notmuch-show-stash-cc ()