This converts the existing logic to use the seen/read distinction. At
this point the logic for deciding whether to mark seen/read is
unchanged, but the actual tagging read is now deferred to
quit/refresh.
---
 emacs/notmuch-show.el |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 05f649b..261c2e3 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1721,7 +1721,7 @@ thread, navigate to the next thread in the parent search buffer."
   (interactive "P")
   (if (notmuch-show-goto-message-next)
       (progn
-	(notmuch-show-mark-read)
+	(notmuch-show-mark-seen)
 	(notmuch-show-message-adjust))
     (if pop-at-end
 	(notmuch-show-next-thread)
@@ -1733,7 +1733,7 @@ thread, navigate to the next thread in the parent search buffer."
   (if (= (point) (notmuch-show-message-top))
       (notmuch-show-goto-message-previous)
     (notmuch-show-move-to-message-top))
-  (notmuch-show-mark-read)
+  (notmuch-show-mark-seen)
   (notmuch-show-message-adjust))
 
 (defun notmuch-show-next-open-message (&optional pop-at-end)
@@ -1749,7 +1749,7 @@ to show, nil otherwise."
 		(not (notmuch-show-message-visible-p))))
     (if r
 	(progn
-	  (notmuch-show-mark-read)
+	  (notmuch-show-mark-seen)
 	  (notmuch-show-message-adjust))
       (if pop-at-end
 	  (notmuch-show-next-thread)
@@ -1764,7 +1764,7 @@ to show, nil otherwise."
 		(not (notmuch-show-get-prop :match))))
     (if r
 	(progn
-	  (notmuch-show-mark-read)
+	  (notmuch-show-mark-seen)
 	  (notmuch-show-message-adjust))
       (goto-char (point-max)))))
 
@@ -1777,7 +1777,7 @@ to show, nil otherwise."
   "Move to the first open message and mark it read"
   (goto-char (point-min))
   (if (notmuch-show-message-visible-p)
-      (notmuch-show-mark-read)
+      (notmuch-show-mark-seen)
     (notmuch-show-next-open-message))
   (when (eobp)
     ;; There are no matched non-excluded messages so open all matched
@@ -1786,7 +1786,7 @@ to show, nil otherwise."
     (force-window-update)
     (goto-char (point-min))
     (if (notmuch-show-message-visible-p)
-	(notmuch-show-mark-read)
+	(notmuch-show-mark-seen)
       (notmuch-show-next-open-message))))
 
 (defun notmuch-show-previous-open-message ()
@@ -1796,7 +1796,7 @@ to show, nil otherwise."
 		  (notmuch-show-goto-message-previous)
 		(notmuch-show-move-to-message-top))
 	      (not (notmuch-show-message-visible-p))))
-  (notmuch-show-mark-read)
+  (notmuch-show-mark-seen)
   (notmuch-show-message-adjust))
 
 (defun notmuch-show-view-raw-message ()
-- 
1.7.9.1