X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=872397646857956e1a8f67db2077e689a6f704a3;hp=0eac1ccbed60efa586cdea6eafa223b2373127ac;hb=8561c7463a5de3bd0990d8244abb1c67ca4f4a7d;hpb=ab68891bec06e793b517b108414df46a47284aad diff --git a/notmuch.el b/notmuch.el index 0eac1ccb..87239764 100644 --- a/notmuch.el +++ b/notmuch.el @@ -41,6 +41,7 @@ (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 "w" 'notmuch-show-view-raw-message) (define-key map "x" 'kill-this-buffer) @@ -68,7 +69,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 +154,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 +166,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 +185,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 +222,19 @@ buffer." (interactive) (view-file (notmuch-show-get-filename))) +(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. @@ -408,7 +423,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) @@ -416,7 +431,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))))) @@ -436,9 +451,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))) @@ -594,6 +615,7 @@ thread from that buffer can be show when done with this one)." (define-key map "b" 'notmuch-search-scroll-down) (define-key map "f" 'notmuch-search-filter) (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 +685,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) @@ -674,15 +697,16 @@ global search. (save-excursion (beginning-of-line) (let ((beg (point))) - (re-search-forward "thread:[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 "thread:[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 @@ -691,22 +715,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")))) @@ -752,12 +763,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 () @@ -768,13 +779,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 @@ -783,7 +795,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) )))) @@ -797,22 +811,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. @@ -820,11 +853,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)