[RFC PATCH] emacs: make show view a/A/x/X key bindings more consistent

[Jani Nikula]

Proposal for show view a/A/x/X key bindings, according to
http://titanpad.com/SA39EbNezU and IRC discussion:

'a' = Archive current message, then move to next message, or show next
thread from search if at the last message in thread.

'A' = Archive each message in thread, then show next thread from
search.

'x' = Archive current message, then move to next message, or exit back
to search results if at the last message in thread.

'X' = Archive each message in thread, then exit back to search
results.

IMHO these changes would make the current implementation more
consistent in two ways: 1) 'a'/'A' would advance to next thread like
'a' used to do, 2) 'x' would operate on messages and 'X' on threads
like 'a'/'A' do now.

The implementation here is hacky at best, and I agree with dme that
notmuch-show.el could use some code cleanup and provide
non-interactive primitives. However I won't have the time and energy
for that right now.
---
 emacs/notmuch-show.el |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index de9421e..62f3664 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1075,9 +1075,10 @@ thread id.  If a prefix is given, crypto processing is toggled."
 	(define-key map "h" 'notmuch-show-toggle-headers)
 	(define-key map "-" 'notmuch-show-remove-tag)
 	(define-key map "+" 'notmuch-show-add-tag)
-	(define-key map "x" 'notmuch-show-archive-thread-then-exit)
-	(define-key map "a" 'notmuch-show-archive-message-then-next)
+	(define-key map "X" 'notmuch-show-archive-thread-then-exit)
+	(define-key map "x" 'notmuch-show-archive-message-then-next-then-exit)
 	(define-key map "A" 'notmuch-show-archive-thread-then-next)
+	(define-key map "a" 'notmuch-show-archive-message-then-next-then-next)
 	(define-key map "N" 'notmuch-show-next-message)
 	(define-key map "P" 'notmuch-show-previous-message)
 	(define-key map "n" 'notmuch-show-next-open-message)
@@ -1425,10 +1426,12 @@ buffer."
     (if r
 	(progn
 	  (notmuch-show-mark-read)
-	  (notmuch-show-message-adjust))
+	  (notmuch-show-message-adjust)
+	  t)
       (if pop-at-end
 	  (notmuch-show-next-thread)
-	(goto-char (point-max))))))
+	(goto-char (point-max))
+	nil))))
 
 (defun notmuch-show-previous-open-message ()
   "Show the previous open message."
@@ -1645,12 +1648,23 @@ removed)."
       (notmuch-show-add-tag "inbox")
     (notmuch-show-remove-tag "inbox")))
 
-(defun notmuch-show-archive-message-then-next ()
-  "Archive the current message, then show the next open message in the current thread."
+(defun notmuch-show-archive-message-then-next-then-exit ()
+  "Archive the current message, then show the next open message in the current thread.
+
+If at the last message in thread, then exit back to search results."
   (interactive)
   (notmuch-show-archive-message)
   (notmuch-show-next-open-message t))
 
+(defun notmuch-show-archive-message-then-next-then-next ()
+  "Archive the current message, then show the next open message in the current thread.
+
+If at the last message in thread, then show next thread from search."
+  (interactive)
+  (notmuch-show-archive-message)
+  (unless (notmuch-show-next-open-message)
+    (notmuch-show-next-thread t)))
+
 (defun notmuch-show-stash-cc ()
   "Copy CC field of current message to kill-ring."
   (interactive)
-- 
1.7.5.4