; Will be much preferable to switch to direct manipulation for
; toggling visibility of these components. Probably using
; overlays-at to query and manipulate the current overlay.
+ (define-key map "a" 'notmuch-show-archive-thread)
(define-key map "b" 'notmuch-show-toggle-body-read-visible)
(define-key map "c" 'notmuch-show-toggle-citations-visible)
(define-key map "h" 'notmuch-show-toggle-headers-visible)
- (define-key map "n" 'notmuch-show-next-message)
+ (define-key map "n" 'notmuch-show-mark-read-then-next-message)
(define-key map "p" 'notmuch-show-previous-message)
(define-key map "q" 'kill-this-buffer)
(define-key map "s" 'notmuch-show-toggle-signatures-visible)
(define-key map "x" 'kill-this-buffer)
+ (define-key map "+" 'notmuch-show-add-tag)
+ (define-key map "-" 'notmuch-show-remove-tag)
map)
"Keymap for \"notmuch show\" buffers.")
(fset 'notmuch-show-mode-map notmuch-show-mode-map)
(defvar notmuch-show-part-end-regexp "\fpart}")
(defvar notmuch-show-marker-regexp "\f\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$")
-(defvar notmuch-show-id-regexp "ID: \\([^ ]*\\)")
+(defvar notmuch-show-id-regexp "ID: \\(.*\\)$")
+(defvar notmuch-show-tags-regexp "(\\([^)]*\\))$")
(defun notmuch-show-get-message-id ()
(save-excursion
(re-search-forward notmuch-show-id-regexp)
(buffer-substring (match-beginning 1) (match-end 1))))
+(defun notmuch-show-set-tags (tags)
+ (save-excursion
+ (beginning-of-line)
+ (if (not (looking-at notmuch-show-message-begin-regexp))
+ (re-search-backward notmuch-show-message-begin-regexp))
+ (re-search-forward notmuch-show-tags-regexp)
+ (let ((inhibit-read-only t)
+ (beg (match-beginning 1))
+ (end (match-end 1)))
+ (delete-region beg end)
+ (goto-char beg)
+ (insert (mapconcat 'identity tags " ")))))
+
+(defun notmuch-show-get-tags ()
+ (save-excursion
+ (beginning-of-line)
+ (if (not (looking-at notmuch-show-message-begin-regexp))
+ (re-search-backward notmuch-show-message-begin-regexp))
+ (re-search-forward notmuch-show-tags-regexp)
+ (split-string (buffer-substring (match-beginning 1) (match-end 1)))))
+
+(defun notmuch-show-add-tag (tag)
+ (interactive "sTag to add: ")
+ (notmuch-call-notmuch-process "tag" (concat "+" tag) (concat "id:" (notmuch-show-get-message-id)))
+ (notmuch-show-set-tags (delete-dups (sort (cons tag (notmuch-show-get-tags)) 'string<))))
+
+(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))))
+
+(defun notmuch-show-archive-thread ()
+ "Archive each message currrently shown by removing the \"inbox\" tag from each.
+
+This command is safe from any race condition of new messages
+being delivered to the same thread. It does not archive the
+entire thread, but only the messages shown in the current
+buffer."
+ (interactive)
+ (save-excursion
+ (goto-char (point-min))
+ (while (not (eobp))
+ (notmuch-show-remove-tag "inbox")
+ (if (not (eobp))
+ (forward-char))
+ (if (not (re-search-forward notmuch-show-message-begin-regexp nil t))
+ (goto-char (point-max))))))
+
(defun notmuch-show-next-message ()
"Advance point to the beginning of the next message in the buffer.
-Before moving, also remove the \"unread\" tag from the current message."
+Does nothing if already on the last message."
(interactive)
- (notmuch-call-notmuch-process "tag" "-unread" (concat "id:" (notmuch-show-get-message-id)))
; First, ensure we get off the current message marker
(if (not (eobp))
(forward-char))
(recenter 0))
(defun notmuch-show-previous-message ()
- "Advance point to the beginning of the previous message in the buffer."
+ "Backup to the beginning of the previous message in the buffer.
+
+Does nothing if already on the first message in the buffer."
(interactive)
; First, ensure we get off the current message marker
(if (not (bobp))
(beginning-of-line)
(recenter 0))
+(defun notmuch-show-mark-read-then-next-message ()
+ "Remove uread 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-markup-citations-region (beg end)
(goto-char beg)
(beginning-of-line)
(goto-char end)))
(next-line))))
-(defun notmuch-show-markup-body (unread)
+(defun notmuch-show-markup-body ()
(re-search-forward notmuch-show-body-begin-regexp)
(next-line 1)
(beginning-of-line)
(let ((beg (point)))
(re-search-forward notmuch-show-body-end-regexp)
- (if (not unread)
- (overlay-put (make-overlay beg (match-beginning 0))
- 'invisible 'notmuch-show-body-read))
- (notmuch-show-markup-citations-region beg (point))
- ))
+ (let ((end (match-beginning 0)))
+ (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))))
(defun notmuch-show-markup-header ()
(re-search-forward notmuch-show-header-begin-regexp)
(defun notmuch-show-markup-message ()
(if (re-search-forward notmuch-show-message-begin-regexp nil t)
(progn
- (let ((unread (looking-at ".*unread$")))
- (notmuch-show-markup-header)
- (notmuch-show-markup-body unread)))
+ (notmuch-show-markup-header)
+ (notmuch-show-markup-body))
(goto-char (point-max))))
(defun notmuch-show-hide-markers ()
(interactive)
(kill-all-local-variables)
(make-local-variable 'notmuch-search-query-string)
+ (add-to-invisibility-spec 'notmuch-search)
(use-local-map notmuch-search-mode-map)
(setq major-mode 'notmuch-search-mode
mode-name "notmuch-search")
(defun notmuch-search-hide-thread-ids ()
(interactive)
- (add-to-invisibility-spec 'notmuch-search))
+ (add-to-invisibility-spec 'notmuch-search)
+ (force-window-update)
+ (redisplay t))
(defun notmuch-search-show-thread-ids ()
(interactive)
- (remove-from-invisibility-spec 'notmuch-search))
+ (remove-from-invisibility-spec 'notmuch-search)
+ (force-window-update)
+ (redisplay t))
(defun notmuch-search-show-thread ()
(interactive)
projects / notmuch / blobdiff