X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=e98a30850fdb95fc35a33e0e51ccd1050e37993b;hp=73f0296349ee0b695a32fcb683bb54a8b15e98e8;hb=f2a4c3e565511a543971da378227b8928a48ab36;hpb=d4c4318fb95ba2ed86823389cf82b11a2bcae073 diff --git a/notmuch.el b/notmuch.el index 73f02963..e98a3085 100644 --- a/notmuch.el +++ b/notmuch.el @@ -33,16 +33,89 @@ (defvar notmuch-show-mode-map (let ((map (make-sparse-keymap))) + (define-key map "h" 'notmuch-show-toggle-headers-visible) + (define-key map "n" 'notmuch-show-next-message) + (define-key map "p" 'notmuch-show-previous-message) + (define-key map "q" 'kill-this-buffer) (define-key map "x" 'kill-this-buffer) map) "Keymap for \"notmuch show\" buffers.") (fset 'notmuch-show-mode-map notmuch-show-mode-map) +(defvar notmuch-show-message-begin-regexp " message{") +(defvar notmuch-show-message-end-regexp " message}") +(defvar notmuch-show-header-begin-regexp " header{") +(defvar notmuch-show-header-end-regexp " header}") + +(defvar notmuch-show-headers-visible t) + +(defun notmuch-show-next-message () + "Advance point to the beginning of the next message in the buffer." + (interactive) + ; First, ensure we get off the current message marker + (if (not (eobp)) + (forward-char)) + (if (not (re-search-forward notmuch-show-message-begin-regexp nil t)) + (goto-char (point-max))) + (beginning-of-line) + (recenter 0)) + +(defun notmuch-show-previous-message () + "Advance point to the beginning of the previous message in the buffer." + (interactive) + ; First, ensure we get off the current message marker + (if (not (eobp)) + (forward-char)) + (if (not (re-search-backward notmuch-show-message-begin-regexp nil t)) + (goto-char (point-min))) + (beginning-of-line) + (recenter 0)) + +(defun notmuch-show-markup-this-header () + (if (re-search-forward notmuch-show-header-begin-regexp nil t) + (progn + (overlay-put (make-overlay (match-beginning 0) (+ (match-end 0) 1)) + 'invisible 'notmuch-show-marker) + (next-line 1) + (beginning-of-line) + (let ((beg (point))) + (if (re-search-forward notmuch-show-header-end-regexp nil t) + (progn + (overlay-put (make-overlay beg (match-beginning 0)) + 'invisible 'notmuch-show-header) + (overlay-put (make-overlay (match-beginning 0) (+ (match-end 0) 1)) + 'invisible 'notmuch-show-marker))))) + (goto-char (point-max)))) + +(defun notmuch-show-markup-headers () + (save-excursion + (goto-char (point-min)) + (while (not (eobp)) + (notmuch-show-markup-this-header)))) + +(defun notmuch-show-toggle-headers-visible () + "Toggle visibility of header fields" + (interactive) + (if notmuch-show-headers-visible + (progn + (add-to-invisibility-spec 'notmuch-show-header) + (set 'notmuch-show-headers-visible nil) + ; Need to force the redisplay for some reason + (force-window-update) + (redisplay t)) + (remove-from-invisibility-spec 'notmuch-show-header) + (set 'notmuch-show-headers-visible t) + (force-window-update) + (redisplay t))) + ;;;###autoload (defun notmuch-show-mode () "Major mode for handling the output of \"notmuch show\"" (interactive) (kill-all-local-variables) + (set (make-local-variable 'notmuch-show-headers-visible) t) + (notmuch-show-toggle-headers-visible) + (add-to-invisibility-spec 'notmuch-show-marker) (use-local-map notmuch-show-mode-map) (setq major-mode 'notmuch-show-mode mode-name "notmuch-show") @@ -60,29 +133,44 @@ (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) + (notmuch-show-markup-headers) ) ))) (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") @@ -95,6 +183,28 @@ (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))) @@ -154,17 +264,33 @@ (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'"