X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=54f4a5812e997a2db270164af380f8127c5bc955;hp=010fc2ff048a883db1a27400f59b64ca89ba0b4a;hb=07b2ef26de452e6ef9f98747e36077c2620d3bce;hpb=1c75d622c9d2ff2531c3c9a4a1d9a1856907c907 diff --git a/notmuch.el b/notmuch.el index 010fc2ff..54f4a581 100644 --- a/notmuch.el +++ b/notmuch.el @@ -33,6 +33,7 @@ (defvar notmuch-show-mode-map (let ((map (make-sparse-keymap))) + (define-key map "q" 'kill-this-buffer) (define-key map "x" 'kill-this-buffer) map) "Keymap for \"notmuch show\" buffers.") @@ -51,7 +52,7 @@ (defun notmuch-show (thread-id) "Run \"notmuch show\" with the given thread ID and display results." (interactive "sNotmuch show: ") - (let ((buffer (get-buffer-create (concat "*notmuch-show-" thread-id)))) + (let ((buffer (get-buffer-create (concat "*notmuch-show-" thread-id "*")))) (switch-to-buffer buffer) (notmuch-show-mode) (let ((proc (get-buffer-process (current-buffer))) @@ -60,7 +61,7 @@ (error "notmuch search process already running for query `%s'" query) ) (erase-buffer) - (beginning-of-buffer) + (goto-char (point-min)) (save-excursion (call-process "notmuch" nil t nil "show" thread-id) ) @@ -68,18 +69,35 @@ (defvar notmuch-search-mode-map (let ((map (make-sparse-keymap))) + (define-key map "a" 'notmuch-search-archive-thread) + (define-key map "f" 'notmuch-search-filter) (define-key map "n" 'next-line) (define-key map "p" 'previous-line) + (define-key map "q" 'kill-this-buffer) + (define-key map "s" 'notmuch-search) + (define-key map "x" 'kill-this-buffer) (define-key map "\r" 'notmuch-search-show-thread) + (define-key map "+" 'notmuch-search-add-tag) + (define-key map "-" 'notmuch-search-remove-tag) + (define-key map "<" 'beginning-of-buffer) + (define-key map ">" 'notmuch-search-goto-last-thread) + (define-key map "\M->" 'notmuch-search-goto-last-thread) map) "Keymap for \"notmuch search\" buffers.") (fset 'notmuch-search-mode-map notmuch-search-mode-map) +(defun notmuch-search-goto-last-thread (&optional arg) + "Move point to the last thread in the buffer." + (interactive "^P") + (end-of-buffer arg) + (beginning-of-line)) + ;;;###autoload (defun notmuch-search-mode () "Major mode for handling the output of \"notmuch search\"" (interactive) (kill-all-local-variables) + (make-local-variable 'notmuch-search-query-string) (use-local-map notmuch-search-mode-map) (setq major-mode 'notmuch-search-mode mode-name "notmuch-search") @@ -92,27 +110,114 @@ (re-search-forward "[a-fA-F0-9]*") (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))) + +(defun notmuch-search-markup-thread-ids () + (save-excursion + (goto-char (point-min)) + (while (not (eobp)) + (notmuch-search-markup-this-thread-id) + (next-line)))) + +(defun notmuch-search-hide-thread-ids () + (interactive) + (add-to-invisibility-spec 'notmuch-search)) + +(defun notmuch-search-show-thread-ids () + (interactive) + (remove-from-invisibility-spec 'notmuch-search)) + (defun notmuch-search-show-thread () (interactive) (notmuch-show (notmuch-search-find-thread-id))) +(defun notmuch-search-call-notmuch-process (&rest args) + (let ((error-buffer (get-buffer-create "*Notmuch errors*"))) + (with-current-buffer error-buffer + (erase-buffer)) + (if (eq (apply 'call-process "notmuch" nil error-buffer nil args) 0) + (point) + (progn + (with-current-buffer error-buffer + (let ((beg (point-min)) + (end (- (point-max) 1))) + (error (buffer-substring beg end)) + )))))) + +(defun notmuch-search-set-tags (tags) + (save-excursion + (end-of-line) + (re-search-backward "(") + (forward-char) + (let ((beg (point)) + (inhibit-read-only t)) + (re-search-forward ")") + (backward-char) + (let ((end (point))) + (delete-region beg end) + (insert (mapconcat 'identity tags " ")))))) + +(defun notmuch-search-get-tags () + (save-excursion + (end-of-line) + (re-search-backward "(") + (let ((beg (+ (point) 1))) + (re-search-forward ")") + (let ((end (- (point) 1))) + (split-string (buffer-substring beg end)))))) + +(defun notmuch-search-add-tag (tag) + (interactive "sTag to add: ") + (notmuch-search-call-notmuch-process "tag" (concat "+" tag) (concat "thread:" (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-search-call-notmuch-process "tag" (concat "-" tag) (concat "thread:" (notmuch-search-find-thread-id))) + (notmuch-search-set-tags (delete tag (notmuch-search-get-tags)))) + +(defun notmuch-search-archive-thread () + (interactive) + (notmuch-search-remove-tag "inbox")) + (defun notmuch-search (query) "Run \"notmuch search\" with the given query string and display results." (interactive "sNotmuch search: ") - (let ((buffer (get-buffer-create (concat "*notmuch-search-" query)))) + (let ((buffer (get-buffer-create (concat "*notmuch-search-" query "*")))) (switch-to-buffer buffer) (notmuch-search-mode) + (set 'notmuch-search-query-string query) (let ((proc (get-buffer-process (current-buffer))) (inhibit-read-only t)) (if proc (error "notmuch search process already running for query `%s'" query) ) (erase-buffer) - (beginning-of-buffer) + (goto-char (point-min)) (save-excursion (call-process "notmuch" nil t nil "search" query) - ) - ))) + (notmuch-search-markup-thread-ids) + ; A well-behaved program ends its output with a newline, but we + ; don't actually want the blank line at the end of the file. + (goto-char (point-max)) + (if (looking-at "^$") + (delete-backward-char 1) + ) + )))) + +(defun notmuch-search-filter (query) + "Run \"notmuch search\" to refine the current search results. + +A search string will be constructed by appending QUERY to the +current search string, and the results of \"notmuch search\" for +the combined query will be displayed." + (interactive "sFilter search: ") + (notmuch-search (concat notmuch-search-query-string " and " query))) (defun notmuch () "Run notmuch to display all mail with tag of 'inbox'"