X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch.el;h=07f5477986b8cc367c153d619f2450a9c33baf92;hb=278ae86f64a58bd9265441d858916f6f0a22ed18;hp=5f394cdd39584b34474160fbf1e4e44a2f5ad570;hpb=446459a5eab3d5a085950a25476079d5188c7528;p=notmuch

diff --git a/notmuch.el b/notmuch.el
index 5f394cdd..07f54779 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -39,6 +39,7 @@
     (define-key map "x" 'kill-this-buffer)
     (define-key map "+" 'notmuch-show-add-tag)
     (define-key map "-" 'notmuch-show-remove-tag)
+    (define-key map " " 'notmuch-show-advance-marking-read-and-archiving)
     map)
   "Keymap for \"notmuch show\" buffers.")
 (fset 'notmuch-show-mode-map notmuch-show-mode-map)
@@ -144,6 +145,19 @@ last message in the buffer."
   (notmuch-show-move-to-current-message-summary-line)
   (recenter 0))
 
+(defun notmuch-show-find-next-message ()
+  "Returns the position of the next message in the buffer.
+
+Or the beginning of the current message if already within the last
+message in the buffer."
+  ; save-excursion doesn't save our window position
+  ; save-window-excursion doesn't save point
+  ; Looks like we have to use both.
+  (save-excursion
+    (save-window-excursion
+      (notmuch-show-next-message)
+      (point))))
+
 (defun notmuch-show-previous-message ()
   "Backup to the beginning of the previous message in the buffer.
 
@@ -162,12 +176,38 @@ simply move to the beginning of the current message."
     (recenter 0)))
 
 (defun notmuch-show-mark-read-then-next-message ()
-  "Remove uread tag from current message, then advance to next message."
+  "Remove unread tag from current message, then advance to next message."
   (interactive)
   (if (member "unread" (notmuch-show-get-tags))
       (notmuch-show-remove-tag "unread"))
   (notmuch-show-next-message))
 
+(defun notmuch-show-advance-marking-read-and-archiving ()
+  "Advance through buffer, marking read and archiving.
+
+This command is intended to be one of the simplest ways to
+process a thread of email. It does the following:
+
+If the current message in the thread is not yet fully visible,
+scroll by a near screenful to read more of the message.
+
+Otherwise, (the end of the current message is already within the
+current window), remove the \"unread\" tag from the current
+message and advance to the next message.
+
+Finally, if there is no further message to advance to, and this
+last message is already read, then archive the entire current
+thread, (remove the \"inbox\" tag from each message)."
+  (interactive)
+  (let ((next (notmuch-show-find-next-message))
+	(unread (member "unread" (notmuch-show-get-tags))))
+    (if (and (not unread)
+	     (equal next (point)))
+	(notmuch-show-archive-thread)
+      (if (< (notmuch-show-find-next-message) (window-end))
+	  (notmuch-show-mark-read-then-next-message)
+	(scroll-up nil)))))
+
 (defun notmuch-show-markup-citations-region (beg end)
   (goto-char beg)
   (beginning-of-line)
@@ -198,10 +238,10 @@ simply move to the beginning of the current message."
   (let ((beg (point)))
     (re-search-forward notmuch-show-body-end-regexp)
     (let ((end (match-beginning 0)))
+      (notmuch-show-markup-citations-region beg end)
       (if (not (member "unread" (notmuch-show-get-tags)))
 	  (overlay-put (make-overlay beg end)
-		       'invisible 'notmuch-show-body-read))
-      (notmuch-show-markup-citations-region beg end))))
+		       'invisible 'notmuch-show-body-read)))))
 
 (defun notmuch-show-markup-header ()
   (re-search-forward notmuch-show-header-begin-regexp)