debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Avoid removing the unread tag due to internal navigation

Browse source 
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.
This commit is contained in:
Carl Worth 2010-02-24 17:02:31 -08:00
parent 4b9d2e3a4d
commit 3474263823
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
notmuch.el
View file

@ -503,14 +503,13 @@ by searching backward)."
(setq btn (previous-button (button-start btn)))) (setq btn (previous-button (button-start btn))))
(not (invisible-p (button-get btn 'invisibility-spec))))) (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. "Advance to the beginning of the next message in the buffer.
Moves to the last visible character of the current message if Moves to the last visible character of the current message if
already on the last message in the buffer. already on the last message in the buffer.
Returns nil if already on the last message in the buffer." Returns nil if already on the last message in the buffer."
(interactive)
(notmuch-show-move-to-current-message-summary-line) (notmuch-show-move-to-current-message-summary-line)
(if (re-search-forward notmuch-show-message-begin-regexp nil t) (if (re-search-forward notmuch-show-message-begin-regexp nil t)
(progn (progn
@ -521,7 +520,18 @@ Returns nil if already on the last message in the buffer."
(while (point-invisible-p) (while (point-invisible-p)
(backward-char)) (backward-char))
(recenter 0) (recenter 0)
nil) 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)) (notmuch-show-mark-read))
(defun notmuch-show-find-next-message () (defun notmuch-show-find-next-message ()
@ -534,7 +544,7 @@ message if already within the last message in the buffer."
; Looks like we have to use both. ; Looks like we have to use both.
(save-excursion (save-excursion
(save-window-excursion (save-window-excursion
(notmuch-show-next-message) (notmuch-show-next-message-without-marking-read)
(point)))) (point))))
(defun notmuch-show-next-unread-message () (defun notmuch-show-next-unread-message ()
@ -542,17 +552,19 @@ message if already within the last message in the buffer."
Moves to the last visible character of the current message if Moves to the last visible character of the current message if
there are no more unread messages past the current point." 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)) (while (and (not (notmuch-show-last-message-p))
(not (notmuch-show-message-unread-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 () (defun notmuch-show-next-open-message ()
"Advance to the next open message (that is, body is not invisible)." "Advance to the next open message (that is, body is not invisible)."
(while (and (notmuch-show-next-message) (while (and (notmuch-show-next-message-without-marking-read)
(not (notmuch-show-message-open-p))))) (not (notmuch-show-message-open-p))))
(notmuch-show-mark-read))
(defun notmuch-show-previous-message () (defun notmuch-show-previous-message ()
"Backup to the beginning of the previous message in the buffer. "Backup to the beginning of the previous message in the buffer.