X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=7e95f95671801e0c2e1c75c47d3bfddd8b792489;hp=592c5ab58da2329806e99cbd695c1d713080db38;hb=933caf814fcbbb7420d03ef42bb37bea6dd90449;hpb=afcd85ee71b9b835da88be371351f2ddab426714 diff --git a/notmuch.el b/notmuch.el index 592c5ab5..7e95f956 100644 --- a/notmuch.el +++ b/notmuch.el @@ -19,7 +19,8 @@ ; ; Authors: Carl Worth -(load "cl-seq") +(require 'cl) +(require 'mm-view) (defvar notmuch-show-mode-map (let ((map (make-sparse-keymap))) @@ -35,13 +36,16 @@ (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 "m" 'message-mail) (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) (define-key map "q" 'kill-this-buffer) + (define-key map "r" 'notmuch-show-reply) (define-key map "s" 'notmuch-show-toggle-signatures-visible) + (define-key map "v" 'notmuch-show-view-all-mime-parts) (define-key map "w" 'notmuch-show-view-raw-message) (define-key map "x" 'kill-this-buffer) (define-key map "+" 'notmuch-show-add-tag) @@ -68,7 +72,7 @@ (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-id-regexp "\\(id:[^ ]*\\)") (set 'notmuch-show-filename-regexp "filename:\\(.*\\)$") (set 'notmuch-show-tags-regexp "(\\([^)]*\\))$") @@ -153,7 +157,7 @@ Unlike builtin `next-line' this version accepts no arguments." (apply 'notmuch-call-notmuch-process (append (cons "tag" (mapcar (lambda (s) (concat "+" s)) toadd)) - (cons (concat "id:" (notmuch-show-get-message-id)) nil))) + (cons (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) @@ -165,7 +169,7 @@ Unlike builtin `next-line' this version accepts no arguments." (apply 'notmuch-call-notmuch-process (append (cons "tag" (mapcar (lambda (s) (concat "-" s)) toremove)) - (cons (concat "id:" (notmuch-show-get-message-id)) nil))) + (cons (notmuch-show-get-message-id) nil))) (notmuch-show-set-tags (sort (set-difference tags toremove :test 'string=) 'string<)))))) (defun notmuch-show-archive-thread-maybe-mark-read (markread) @@ -184,6 +188,7 @@ Unlike builtin `next-line' this version accepts no arguments." (if parent-buffer (progn (switch-to-buffer parent-buffer) + (forward-line) (notmuch-search-show-thread))))) (defun notmuch-show-mark-read-then-archive-thread () @@ -220,6 +225,31 @@ buffer." (interactive) (view-file (notmuch-show-get-filename))) +(defun notmuch-show-view-all-mime-parts () + "Use external viewers (according to mailcap) to view all MIME-encoded parts." + (interactive) + (save-excursion + (let ((filename (notmuch-show-get-filename))) + (switch-to-buffer (generate-new-buffer (concat "*notmuch-mime-" + filename + "*"))) + (insert-file-contents filename nil nil nil t) + (mm-display-parts (mm-dissect-buffer)) + (kill-this-buffer)))) + +(defun notmuch-show-reply () + "Begin composing a reply to the current message in a new buffer." + (interactive) + (let ((message-id (notmuch-show-get-message-id))) + (switch-to-buffer (generate-new-buffer "notmuch-draft")) + (call-process "notmuch" nil t nil "reply" message-id) + (goto-char (point-min)) + (if (re-search-forward "^$" nil t) + (progn + (insert "--text follows this line--") + (forward-line))) + (message-mode))) + (defun notmuch-show-pipe-message (command) "Pipe the contents of the current message to the given command. @@ -436,9 +466,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))) @@ -593,7 +629,9 @@ thread from that buffer can be show when done with this one)." (define-key map "a" 'notmuch-search-archive-thread) (define-key map "b" 'notmuch-search-scroll-down) (define-key map "f" 'notmuch-search-filter) + (define-key map "m" 'message-mail) (define-key map "n" 'next-line) + (define-key map "o" 'notmuch-search-toggle-order) (define-key map "p" 'previous-line) (define-key map "q" 'kill-this-buffer) (define-key map "s" 'notmuch-search) @@ -663,6 +701,7 @@ global search. (interactive) (kill-all-local-variables) (make-local-variable 'notmuch-search-query-string) + (make-local-variable 'notmuch-search-oldest-first) (set (make-local-variable 'scroll-preserve-screen-position) t) (add-to-invisibility-spec 'notmuch-search) (use-local-map notmuch-search-mode-map) @@ -692,22 +731,9 @@ global search. (notmuch-search-markup-this-thread-id) (next-line)))) -(defun notmuch-search-hide-thread-ids () - (interactive) - (add-to-invisibility-spec 'notmuch-search) - (force-window-update) - (redisplay t)) - -(defun notmuch-search-show-thread-ids () - (interactive) - (remove-from-invisibility-spec 'notmuch-search) - (force-window-update) - (redisplay t)) - (defun notmuch-search-show-thread () (interactive) (let ((thread-id (notmuch-search-find-thread-id))) - (forward-line) (if (> (length thread-id) 0) (notmuch-show thread-id (current-buffer)) (error "End of search results")))) @@ -753,12 +779,12 @@ and will also appear in a buffer named \"*Notmuch errors*\"." (defun notmuch-search-add-tag (tag) (interactive "sTag to add: ") - (notmuch-call-notmuch-process "tag" (concat "+" tag) (concat "thread:" (notmuch-search-find-thread-id))) + (notmuch-call-notmuch-process "tag" (concat "+" tag) (notmuch-search-find-thread-id)) (notmuch-search-set-tags (delete-dups (sort (cons tag (notmuch-search-get-tags)) 'string<)))) (defun notmuch-search-remove-tag (tag) (interactive "sTag to remove: ") - (notmuch-call-notmuch-process "tag" (concat "-" tag) (concat "thread:" (notmuch-search-find-thread-id))) + (notmuch-call-notmuch-process "tag" (concat "-" tag) (notmuch-search-find-thread-id)) (notmuch-search-set-tags (delete tag (notmuch-search-get-tags)))) (defun notmuch-search-archive-thread () @@ -769,13 +795,14 @@ This function advances point to the next line when finished." (notmuch-search-remove-tag "inbox") (forward-line)) -(defun notmuch-search (query) +(defun notmuch-search (query &optional oldest-first) "Run \"notmuch search\" with the given query string and display results." (interactive "sNotmuch search: ") (let ((buffer (get-buffer-create (concat "*notmuch-search-" query "*")))) (switch-to-buffer buffer) (notmuch-search-mode) (set 'notmuch-search-query-string query) + (set 'notmuch-search-oldest-first oldest-first) (let ((proc (get-buffer-process (current-buffer))) (inhibit-read-only t)) (if proc @@ -784,7 +811,9 @@ This function advances point to the next line when finished." (erase-buffer) (goto-char (point-min)) (save-excursion - (call-process "notmuch" nil t nil "search" query) + (if oldest-first + (call-process "notmuch" nil t nil "search" query) + (call-process "notmuch" nil t nil "search" "--reverse" query)) (notmuch-search-markup-thread-ids) )))) @@ -798,22 +827,41 @@ thread. Otherwise, point will be moved to attempt to be in the same relative position within the new buffer." (interactive) (let ((here (point)) + (oldest-first notmuch-search-oldest-first) (thread (notmuch-search-find-thread-id)) (query notmuch-search-query-string)) (kill-this-buffer) - (notmuch-search query) + (notmuch-search query oldest-first) (goto-char (point-min)) (if (re-search-forward (concat "^" thread) nil t) (beginning-of-line) (goto-char here)))) +(defun notmuch-search-toggle-order () + "Toggle the current search order. + +By default, the \"inbox\" view created by `notmuch' is displayed +in chronological order (oldest thread at the beginning of the +buffer), while any global searches created by `notmuch-search' +are displayed in reverse-chronological order (newest thread at +the beginning of the buffer). + +This command toggles the sort order for the current search. + +Note that any fitlered searches created by +`notmuch-search-filter' retain the search order of the parent +search." + (interactive) + (set 'notmuch-search-oldest-first (not notmuch-search-oldest-first)) + (notmuch-search-refresh-view)) + (defun notmuch-search-filter (query) "Filter the current search results based on an additional query string. Runs a new search matching only messages that match both the current search results AND the additional query string provided." (interactive "sFilter search: ") - (notmuch-search (concat notmuch-search-query-string " and " query))) + (notmuch-search (concat notmuch-search-query-string " and " query) notmuch-search-oldest-first)) (defun notmuch-search-filter-by-tag (tag) "Filter the current search results based on a single tag. @@ -821,11 +869,11 @@ current search results AND the additional query string provided." Runs a new search matching only messages that match both the current search results AND that are tagged with the given tag." (interactive "sFilter by tag: ") - (notmuch-search (concat notmuch-search-query-string " and tag:" tag))) + (notmuch-search (concat notmuch-search-query-string " and tag:" tag) notmuch-search-oldest-first)) (defun notmuch () "Run notmuch to display all mail with tag of 'inbox'" (interactive) - (notmuch-search "tag:inbox")) + (notmuch-search "tag:inbox" t)) (provide 'notmuch)