Sometimes the internals of the implementation navigate among messages,
(as opposed to the user explicitly requesting the next message to be
shown). In these cases we don't want to remove the unread tag from the
message navigated to.
This fixes a bug where invocation of notmuch-show-next-unread-message
would clear the unread tag from all messages in a thread.
(setq btn (previous-button (button-start btn))))
(not (invisible-p (button-get btn 'invisibility-spec)))))
(setq btn (previous-button (button-start btn))))
(not (invisible-p (button-get btn 'invisibility-spec)))))
-(defun notmuch-show-next-message ()
+(defun notmuch-show-next-message-without-marking-read ()
"Advance to the beginning of the next message in the buffer.
Moves to the last visible character of the current message if
already on the last message in the buffer.
Returns nil if already on the last message in the buffer."
"Advance to the beginning of the next message in the buffer.
Moves to the last visible character of the current message if
already on the last message in the buffer.
Returns nil if already on the last message in the buffer."
(notmuch-show-move-to-current-message-summary-line)
(if (re-search-forward notmuch-show-message-begin-regexp nil t)
(progn
(notmuch-show-move-to-current-message-summary-line)
(if (re-search-forward notmuch-show-message-begin-regexp nil t)
(progn
(while (point-invisible-p)
(backward-char))
(recenter 0)
(while (point-invisible-p)
(backward-char))
(recenter 0)
+ nil))
+
+(defun notmuch-show-next-message ()
+ "Advance to the beginning of the next message in the buffer.
+and remove the unread tag from that message.
+
+Moves to the last visible character of the current message if
+already on the last message in the buffer.
+
+Returns nil if already on the last message in the buffer."
+ (interactive)
+ (notmuch-show-next-message-without-marking-read)
(notmuch-show-mark-read))
(defun notmuch-show-find-next-message ()
(notmuch-show-mark-read))
(defun notmuch-show-find-next-message ()
; Looks like we have to use both.
(save-excursion
(save-window-excursion
; Looks like we have to use both.
(save-excursion
(save-window-excursion
- (notmuch-show-next-message)
+ (notmuch-show-next-message-without-marking-read)
(point))))
(defun notmuch-show-next-unread-message ()
(point))))
(defun notmuch-show-next-unread-message ()
Moves to the last visible character of the current message if
there are no more unread messages past the current point."
Moves to the last visible character of the current message if
there are no more unread messages past the current point."
- (notmuch-show-next-message)
+ (notmuch-show-next-message-without-marking-read)
(while (and (not (notmuch-show-last-message-p))
(not (notmuch-show-message-unread-p)))
(while (and (not (notmuch-show-last-message-p))
(not (notmuch-show-message-unread-p)))
- (notmuch-show-next-message))
+ (notmuch-show-next-message-without-marking-read))
(if (not (notmuch-show-message-unread-p))
(if (not (notmuch-show-message-unread-p))
- (notmuch-show-next-message)))
+ (notmuch-show-next-message-without-marking-read))
+ (notmuch-show-mark-read))
(defun notmuch-show-next-open-message ()
"Advance to the next open message (that is, body is not invisible)."
(defun notmuch-show-next-open-message ()
"Advance to the next open message (that is, body is not invisible)."
- (while (and (notmuch-show-next-message)
- (not (notmuch-show-message-open-p)))))
+ (while (and (notmuch-show-next-message-without-marking-read)
+ (not (notmuch-show-message-open-p))))
+ (notmuch-show-mark-read))
(defun notmuch-show-previous-message ()
"Backup to the beginning of the previous message in the buffer.
(defun notmuch-show-previous-message ()
"Backup to the beginning of the previous message in the buffer.