X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=c59b40db76d034887f8710922d3e459647e9c971;hp=7f087c7240de754e1510af878885129ba3d08a03;hb=daedd2442af849c9693e0f13aaed5e7634a4dc54;hpb=fbf473220b073d58ad19cfef0ad4616149077ecd diff --git a/notmuch.el b/notmuch.el index 7f087c72..c59b40db 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) @@ -94,8 +95,11 @@ (defun notmuch-show-remove-tag (tag) (interactive "sTag to remove: ") - (notmuch-call-notmuch-process "tag" (concat "-" tag) (concat "id:" (notmuch-show-get-message-id))) - (notmuch-show-set-tags (delete tag (notmuch-show-get-tags)))) + (let ((tags (notmuch-show-get-tags))) + (if (member tag tags) + (progn + (notmuch-call-notmuch-process "tag" (concat "-" tag) (concat "id:" (notmuch-show-get-message-id))) + (notmuch-show-set-tags (delete tag tags)))))) (defun notmuch-show-archive-thread () "Archive each message currrently shown by removing the \"inbox\" tag from each. @@ -114,61 +118,98 @@ buffer." (if (not (re-search-forward notmuch-show-message-begin-regexp nil t)) (goto-char (point-max)))))) +(defun notmuch-show-move-to-current-message-summary-line () + "Move to the beginning of the one-line summary of the current message. + +This gives us a stable place to move to and work from since the +summary line is always visible. This is important since moving to +an invisible location is unreliable, (the main command loop moves +point either forward or backward to the next visible character +when a command ends with point on an invisible character). + +Emits an error if point is not within a valid message, (that is +not pattern of `notmuch-show-message-begin-regexp' could be found +by searching backward)." + (beginning-of-line) + (if (not (looking-at notmuch-show-message-begin-regexp)) + (if (re-search-backward notmuch-show-message-begin-regexp nil t) + (forward-line 2) + (error "Not within a valid message.")) + (forward-line 2))) + (defun notmuch-show-next-message () - "Advance point to the beginning of the next message in the buffer. + "Advance to the beginning of the next message in the buffer. -Does nothing if already on the last message." +Moves to the beginning of the current message if already on the +last message in the buffer." (interactive) - ; First, ensure we get off the current message marker - (if (not (eobp)) - (forward-char)) + (notmuch-show-move-to-current-message-summary-line) (re-search-forward notmuch-show-message-begin-regexp nil t) - ; This dance might look pointless, but it's important. I originally - ; just had (beginning-of-line) here which looked right on the - ; display but actually put point all the way back to the first - ; character of the first invisible line. That is, it put point into - ; the closing markers of the previous message rather than at the - ; beginning of the current message. And that in turn meant that - ; looking up the current message-ID would actually return the - ; previous message ID. - ; - ; So this dance ensures that we're actually on the current message - ; when it looks like we are. - (end-of-visible-line) - (beginning-of-line) + (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. -Does nothing if already on the first message in the buffer." +If within a message rather than at the beginning of it, then +simply move to the beginning of the current message." (interactive) - ; First, ensure we get off the current message marker - (if (not (bobp)) - (previous-line)) - (re-search-backward notmuch-show-message-begin-regexp nil t) - ; This dance might look pointless, but it's important. I originally - ; just had (beginning-of-line) here which looked right on the - ; display but actually put point all the way back to the first - ; character of the first invisible line. That is, it put point into - ; the closing markers of the previous message rather than at the - ; beginning of the current message. And that in turn meant that - ; looking up the current message-ID would actually return the - ; previous message ID. - ; - ; So this dance ensures that we're actually on the current message - ; when it looks like we are. - (end-of-visible-line) - (beginning-of-line) - (recenter 0)) + (let ((start (point))) + (notmuch-show-move-to-current-message-summary-line) + (if (not (< (point) start)) + ; Go backward twice to skip the current message's marker + (progn + (re-search-backward notmuch-show-message-begin-regexp nil t) + (re-search-backward notmuch-show-message-begin-regexp nil t) + (notmuch-show-move-to-current-message-summary-line) + )) + (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-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) @@ -199,10 +240,10 @@ Does nothing if already on the first message in the buffer." (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) @@ -353,7 +394,7 @@ view, (remove the \"inbox\" tag from each), with (define-key map "s" 'notmuch-search) (define-key map "t" 'notmuch-search-filter-by-tag) (define-key map "x" 'kill-this-buffer) - (define-key map "\r" 'notmuch-search-show-thread) + (define-key map (kbd "RET") 'notmuch-search-show-thread) (define-key map "+" 'notmuch-search-add-tag) (define-key map "-" 'notmuch-search-remove-tag) (define-key map "<" 'beginning-of-buffer) @@ -437,7 +478,9 @@ global search. (defun notmuch-search-show-thread () (interactive) - (notmuch-show (notmuch-search-find-thread-id))) + (let ((thread-id (notmuch-search-find-thread-id))) + (forward-line) + (notmuch-show thread-id))) (defun notmuch-call-notmuch-process (&rest args) (let ((error-buffer (get-buffer-create "*Notmuch errors*"))) @@ -490,7 +533,7 @@ global search. This function advances point to the next line when finished." (interactive) (notmuch-search-remove-tag "inbox") - (next-line)) + (forward-line)) (defun notmuch-search (query) "Run \"notmuch search\" with the given query string and display results."