X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=4e649d441401239b9ddafa9258ade2d838b56acf;hp=50e573dde01a070c9232fc7af56847daf2d487f5;hb=306e19f5ddec1b10a0e99ccc54823544187e7ac3;hpb=3a330cb84a4f42d0013a772609fd10330a8413b0 diff --git a/notmuch.el b/notmuch.el index 50e573dd..4e649d44 100644 --- a/notmuch.el +++ b/notmuch.el @@ -19,6 +19,8 @@ ; ; Authors: Carl Worth +(load "cl-seq") + (defvar notmuch-show-mode-map (let ((map (make-sparse-keymap))) ; I don't actually want all of these toggle commands occupying @@ -29,10 +31,12 @@ ; 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 "A" 'notmuch-show-mark-read-then-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-open-message) (define-key map "p" 'notmuch-show-previous-message) (define-key map (kbd "C-n") 'notmuch-show-next-line) (define-key map (kbd "C-p") 'notmuch-show-previous-line) @@ -44,6 +48,7 @@ (define-key map "-" 'notmuch-show-remove-tag) (define-key map (kbd "DEL") 'notmuch-show-rewind) (define-key map " " 'notmuch-show-advance-marking-read-and-archiving) + (define-key map "|" 'notmuch-show-pipe-message) map) "Keymap for \"notmuch show\" buffers.") (fset 'notmuch-show-mode-map notmuch-show-mode-map) @@ -63,8 +68,8 @@ (set 'notmuch-show-part-end-regexp " part}") (set 'notmuch-show-marker-regexp " \\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$") -(set 'notmuch-show-id-regexp "ID: \\([^ ]*\\)") -(set 'notmuch-show-filename-regexp "Filename: \\(.*\\)$") +(set 'notmuch-show-id-regexp "id:\\([^ ]*\\)") +(set 'notmuch-show-filename-regexp "filename:\\(.*\\)$") (set 'notmuch-show-tags-regexp "(\\([^)]*\\))$") ; XXX: This should be a generic function in emacs somewhere, not here @@ -142,35 +147,34 @@ Unlike builtin `next-line' this version accepts no arguments." (re-search-forward notmuch-show-tags-regexp) (split-string (buffer-substring (match-beginning 1) (match-end 1))))) -(defun notmuch-show-add-tag (tag) +(defun notmuch-show-add-tag (&rest toadd) + "Add a tag to the current message." (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) + (apply 'notmuch-call-notmuch-process + (append (cons "tag" + (mapcar (lambda (s) (concat "+" s)) toadd)) + (cons (concat "id:" (notmuch-show-get-message-id)) nil))) + (notmuch-show-set-tags (sort (union toadd (notmuch-show-get-tags) :test 'string=) 'string<))) + +(defun notmuch-show-remove-tag (&rest toremove) + "Remove a tag from the current message." (interactive "sTag to remove: ") (let ((tags (notmuch-show-get-tags))) - (if (member tag tags) + (if (intersection tags toremove :test 'string=) (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 in thread, and show next thread from search. + (apply 'notmuch-call-notmuch-process + (append (cons "tag" + (mapcar (lambda (s) (concat "-" s)) toremove)) + (cons (concat "id:" (notmuch-show-get-message-id)) nil))) + (notmuch-show-set-tags (sort (set-difference tags toremove :test 'string=) 'string<)))))) -Archive each message currrently shown by removing the \"inbox\" -tag from each. Then kill this buffer and show the next thread -from the search from which this thread was originally shown. - -Note: 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) +(defun notmuch-show-archive-thread-maybe-mark-read (markread) (save-excursion (goto-char (point-min)) (while (not (eobp)) - (notmuch-show-remove-tag "inbox") + (if markread + (notmuch-show-remove-tag "unread" "inbox") + (notmuch-show-remove-tag "inbox")) (if (not (eobp)) (forward-char)) (if (not (re-search-forward notmuch-show-message-begin-regexp nil t)) @@ -182,11 +186,49 @@ buffer." (switch-to-buffer parent-buffer) (notmuch-search-show-thread))))) +(defun notmuch-show-mark-read-then-archive-thread () + "Remove \"unread\" tag from each message, then archive and show next thread. + +Archive each message currrently shown by removing the \"unread\" +and \"inbox\" tag from each. Then kill this buffer and show the +next thread from the search from which this thread was originally +shown. + +Note: 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) + (notmuch-show-archive-thread-maybe-mark-read t)) + +(defun notmuch-show-archive-thread () + "Archive each message in thread, and show next thread from search. + +Archive each message currrently shown by removing the \"inbox\" +tag from each. Then kill this buffer and show the next thread +from the search from which this thread was originally shown. + +Note: 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) + (notmuch-show-archive-thread-maybe-mark-read nil)) + (defun notmuch-show-view-raw-message () "View the raw email of the current message." (interactive) (view-file (notmuch-show-get-filename))) +(defun notmuch-show-pipe-message (command) + "Pipe the contents of the current message to the given command. + +The given command will be executed with the raw contents of the +current email message as stdin. Anything printed by the command +to stdout or stderr will appear in the *Messages* buffer." + (interactive "sPipe message to command: ") + (apply 'start-process-shell-command "notmuch-pipe-command" "*notmuch-pipe*" (split-string (concat command " < " (notmuch-show-get-filename))))) + (defun notmuch-show-move-to-current-message-summary-line () "Move to the beginning of the one-line summary of the current message. @@ -348,11 +390,10 @@ which this thread was originally shown." (unread (notmuch-show-message-unread-p))) (if (> next (window-end)) (scroll-up nil) - (if unread - (notmuch-show-mark-read-then-next-open-message) - (if (notmuch-show-last-message-p) - (notmuch-show-archive-thread) - (notmuch-show-next-open-message)))))) + (let ((last (notmuch-show-last-message-p))) + (notmuch-show-mark-read-then-next-open-message) + (if last + (notmuch-show-archive-thread)))))) (defun notmuch-show-markup-citations-region (beg end) (goto-char beg) @@ -367,7 +408,7 @@ which this thread was originally shown." (overlay-put overlay 'invisible 'notmuch-show-citation) (overlay-put overlay 'before-string (concat "[" (number-to-string (count-lines beg-sub (point))) - " quoted lines.]\n"))))) + "-line citation. Press 'c' to show.]\n"))))) (if (looking-at "--[ ]?$") (let ((sig-lines (count-lines beg-sub end))) (if (<= sig-lines notmuch-show-signature-lines-max) @@ -375,7 +416,7 @@ which this thread was originally shown." (overlay-put (make-overlay beg-sub (+ beg-sub 1)) 'before-string (concat "[" (number-to-string sig-lines) - "-line signature.]")) + "-line signature. Press 's' to show.]")) (overlay-put (make-overlay (+ beg-sub 2) end) 'invisible 'notmuch-show-signature) (goto-char end))))) @@ -395,9 +436,15 @@ which this thread was originally shown." (defun notmuch-show-markup-header () (re-search-forward notmuch-show-header-begin-regexp) - (next-line 2) + (forward-line 1) (beginning-of-line) (let ((beg (point))) + (end-of-line) + ; Inverse video for subject + (overlay-put (make-overlay beg (point)) 'face '((cons :inverse-video t))) + (beginning-of-line) + (forward-line 2) + (set 'beg (point)) (re-search-forward notmuch-show-header-end-regexp) (overlay-put (make-overlay beg (match-beginning 0)) 'invisible 'notmuch-show-header))) @@ -633,15 +680,16 @@ global search. (save-excursion (beginning-of-line) (let ((beg (point))) - (re-search-forward "[a-fA-F0-9]*") + (re-search-forward "thread:[a-fA-F0-9]*" nil t) (filter-buffer-substring beg (point))))) (defun notmuch-search-markup-this-thread-id () (beginning-of-line) (let ((beg (point))) - (re-search-forward "[a-fA-F0-9]*") - (forward-char) - (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search))) + (if (re-search-forward "thread:[a-fA-F0-9]*" nil t) + (progn + (forward-char) + (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search))))) (defun notmuch-search-markup-thread-ids () (save-excursion @@ -671,6 +719,10 @@ global search. (error "End of search results")))) (defun notmuch-call-notmuch-process (&rest args) + "Synchronously invoke \"notmuch\" with the given list of arguments. + +Output from the process will be presented to the user as an error +and will also appear in a buffer named \"*Notmuch errors*\"." (let ((error-buffer (get-buffer-create "*Notmuch errors*"))) (with-current-buffer error-buffer (erase-buffer))