X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=74772952740d4a08ddfe1cbafdb9af0108d92822;hp=7fe5e9783cc0fdab735c6ea5f102a5b1068961e3;hb=3998f3a61cdc70849764f397df5e138d357329c7;hpb=8debf74e82c16890a033ea9008a993da0db1b99a diff --git a/notmuch.el b/notmuch.el index 7fe5e978..74772952 100644 --- a/notmuch.el +++ b/notmuch.el @@ -33,15 +33,36 @@ (defvar notmuch-show-mode-map (let ((map (make-sparse-keymap))) + ; I don't actually want all of these toggle commands occupying + ; keybindings. They steal valuable key-binding space, are hard + ; to remember, and act globally rather than locally. + ; + ; Will be much preferable to switch to direct manipulation for + ; toggling visibility of these components. Probably using + ; overlays-at to query and manipulate the current overlay. + (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 "p" 'notmuch-show-previous-message) (define-key map "q" 'kill-this-buffer) + (define-key map "s" 'notmuch-show-toggle-signatures-visible) (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-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-body-begin-regexp " body{") +(defvar notmuch-show-body-end-regexp " body}") +(defvar notmuch-show-attachment-begin-regexp " attachment{") +(defvar notmuch-show-attachment-end-regexp " attachment}") +(defvar notmuch-show-part-begin-regexp " part{") +(defvar notmuch-show-part-end-regexp " part}") +(defvar notmuch-show-marker-regexp " \\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$") (defun notmuch-show-next-message () "Advance point to the beginning of the next message in the buffer." @@ -49,26 +70,147 @@ ; 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)) + (re-search-forward notmuch-show-message-begin-regexp nil t) + (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)) + (if (not (bobp)) + (previous-line)) + (re-search-backward notmuch-show-message-begin-regexp nil t) + (beginning-of-line) + (recenter 0)) + +(defun notmuch-show-markup-citations-region (beg end) + (goto-char beg) + (beginning-of-line) + (while (< (point) end) + (let ((beg-sub (point))) + (if (looking-at ">") + (progn + (while (looking-at ">") + (next-line)) + (let ((overlay (make-overlay beg-sub (point)))) + (overlay-put overlay 'invisible 'notmuch-show-citation) + (overlay-put overlay 'before-string + (concat "[" (number-to-string (count-lines beg-sub (point))) + " quoted lines.]"))))) + (if (looking-at "--[ ]?$") + (let ((overlay (make-overlay beg-sub end))) + (overlay-put overlay 'invisible 'notmuch-show-signature) + (overlay-put overlay 'before-string + (concat "[" (number-to-string (count-lines beg-sub (point))) + "-line signature.]")) + (goto-char end))) + (next-line)))) + +(defun notmuch-show-markup-body (unread) + (re-search-forward notmuch-show-body-begin-regexp) + (next-line 1) + (beginning-of-line) + (let ((beg (point))) + (re-search-forward notmuch-show-body-end-regexp) + (if (not unread) + (overlay-put (make-overlay beg (match-beginning 0)) + 'invisible 'notmuch-show-body-read)) + (notmuch-show-markup-citations-region beg (point)) + )) + +(defun notmuch-show-markup-header () + (re-search-forward notmuch-show-header-begin-regexp) + (next-line 2) + (beginning-of-line) + (let ((beg (point))) + (re-search-forward notmuch-show-header-end-regexp) + (overlay-put (make-overlay beg (match-beginning 0)) + 'invisible 'notmuch-show-header))) + +(defun notmuch-show-markup-message () + (if (re-search-forward notmuch-show-message-begin-regexp nil t) (progn - (goto-char (point-min)) - (beginning-of-line)))) + (let ((unread (looking-at ".*unread$"))) + (notmuch-show-markup-header) + (notmuch-show-markup-body unread))) + (goto-char (point-max)))) + +(defun notmuch-show-hide-markers () + (save-excursion + (goto-char (point-min)) + (while (not (eobp)) + (if (re-search-forward notmuch-show-marker-regexp nil t) + (progn + (overlay-put (make-overlay (match-beginning 0) (+ (match-end 0) 1)) + 'invisible 'notmuch-show-marker)) + (goto-char (point-max)))))) + +(defun notmuch-show-markup-messages () + (save-excursion + (goto-char (point-min)) + (while (not (eobp)) + (notmuch-show-markup-message))) + (notmuch-show-hide-markers)) + +(defun notmuch-show-toggle-citations-visible () + "Toggle visibility of citations" + (interactive) + (if notmuch-show-citations-visible + (add-to-invisibility-spec 'notmuch-show-citation) + (remove-from-invisibility-spec 'notmuch-show-citation)) + (set 'notmuch-show-citations-visible (not notmuch-show-citations-visible)) + ; Need to force the redisplay for some reason + (force-window-update) + (redisplay t)) + +(defun notmuch-show-toggle-signatures-visible () + "Toggle visibility of signatures" + (interactive) + (if notmuch-show-signatures-visible + (add-to-invisibility-spec 'notmuch-show-signature) + (remove-from-invisibility-spec 'notmuch-show-signature)) + (set 'notmuch-show-signatures-visible (not notmuch-show-signatures-visible)) + ; Need to force the redisplay for some reason + (force-window-update) + (redisplay t)) + +(defun notmuch-show-toggle-headers-visible () + "Toggle visibility of header fields" + (interactive) + (if notmuch-show-headers-visible + (add-to-invisibility-spec 'notmuch-show-header) + (remove-from-invisibility-spec 'notmuch-show-header)) + (set 'notmuch-show-headers-visible (not notmuch-show-headers-visible)) + ; Need to force the redisplay for some reason + (force-window-update) + (redisplay t)) + +(defun notmuch-show-toggle-body-read-visible () + "Toggle visibility of message bodies of read messages" + (interactive) + (if notmuch-show-body-read-visible + (add-to-invisibility-spec 'notmuch-show-body-read) + (remove-from-invisibility-spec 'notmuch-show-body-read)) + (set 'notmuch-show-body-read-visible (not notmuch-show-body-read-visible)) + ; Need to force the redisplay for some reason + (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) + (set (make-local-variable 'notmuch-show-body-read-visible) t) + (notmuch-show-toggle-body-read-visible) + (set (make-local-variable 'notmuch-show-citations-visible) t) + (notmuch-show-toggle-citations-visible) + (set (make-local-variable 'notmuch-show-signatures-visible) t) + (notmuch-show-toggle-signatures-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") @@ -89,6 +231,7 @@ (goto-char (point-min)) (save-excursion (call-process "notmuch" nil t nil "show" thread-id) + (notmuch-show-markup-messages) ) )))