X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=de9421e80879edb544a949d801719b412bb10c92;hb=7cd907b69c3134b00f8766571b17b669bd8a80c2;hp=293c00b669cdfbaa563746c2dae4f5cb13c0d6f3;hpb=cdb51decddc4b013a47e7164891c5bc9041f6fc3;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 293c00b6..de9421e8 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1076,7 +1076,8 @@ thread id.  If a prefix is given, crypto processing is toggled."
 	(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-thread-then-next)
+	(define-key map "a" 'notmuch-show-archive-message-then-next)
+	(define-key map "A" 'notmuch-show-archive-thread-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)
@@ -1430,7 +1431,7 @@ buffer."
 	(goto-char (point-max))))))
 
 (defun notmuch-show-previous-open-message ()
-  "Show the previous message."
+  "Show the previous open message."
   (interactive)
   (while (and (notmuch-show-goto-message-previous)
 	      (not (notmuch-show-message-visible-p))))
@@ -1648,7 +1649,7 @@ removed)."
   "Archive the current message, then show the next open message in the current thread."
   (interactive)
   (notmuch-show-archive-message)
-  (notmuch-show-next-open-message))
+  (notmuch-show-next-open-message t))
 
 (defun notmuch-show-stash-cc ()
   "Copy CC field of current message to kill-ring."