Signed-off-by: Damien Cassou <damien.cassou at gmail.com> --- emacs/notmuch-show.el | 15 +++++++-------- emacs/notmuch-tagger.el | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index a71497a..93bce07 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -362,10 +362,8 @@ operation on the contents of the current buffer." (goto-char (notmuch-show-message-top)) (if (re-search-forward "(\\([^()]*\\))$" (line-end-position) t) (let ((inhibit-read-only t)) - (replace-match (concat "(" - (propertize (mapconcat 'identity tags " ") - 'face 'notmuch-tag-face) - ")"))))) + (replace-match (propertize (notmuch-tagger-format-tags tags) + 'face 'notmuch-tag-face))))) (notmuch-show-update-header-line)) (defun notmuch-clean-address (address) @@ -442,10 +440,11 @@ message at DEPTH in the current thread." (notmuch-show-clean-address (plist-get headers :From)) " (" date - ") (" - (propertize (mapconcat 'identity tags " ") - 'face 'notmuch-tag-face) - ")\n") + ") " + (propertize + (notmuch-tagger-format-tags tags) + 'face 'notmuch-tag-face) + "\n") (overlay-put (make-overlay start (point)) 'face 'notmuch-message-summary-face))) (defun notmuch-show-insert-header (header header-value) diff --git a/emacs/notmuch-tagger.el b/emacs/notmuch-tagger.el index 38b858a..35b81ca 100644 --- a/emacs/notmuch-tagger.el +++ b/emacs/notmuch-tagger.el @@ -44,12 +44,21 @@ test if the library is present before calling this function." (let ((tag (header-button-get button 'notmuch-tagger-tag))) (notmuch-tagger-goto-target tag))) +(defun notmuch-tagger-body-button-action (button) + "Open `notmuch-search' for the tag referenced by BUTTON." + (let ((tag (button-get button 'notmuch-tagger-tag))) + (notmuch-tagger-goto-target tag))) + (eval-after-load "header-button" '(define-button-type 'notmuch-tagger-header-button-type 'supertype 'header 'action #'notmuch-tagger-header-button-action 'follow-link t)) +(define-button-type 'notmuch-tagger-body-button-type + 'action #'notmuch-tagger-body-button-action + 'follow-link t) + (defun notmuch-tagger-really-make-header-link (tag) "Return a property list that presents a link to TAG. @@ -73,6 +82,20 @@ if not." (notmuch-tagger-really-make-header-link tag) tag)) +(defun notmuch-tagger-make-body-link (tag) + "Return a property list that presents a link to TAG. +The returned property list will not work in the header-line. For +a link that works on the header-line, prefer +`notmuch-tagger-make-header-link'." + (let ((button (copy-sequence tag))) + (make-text-button + button nil + 'type 'notmuch-tagger-body-button-type + 'notmuch-tagger-tag tag + 'skip t ;; don't stop when using TAB + 'help-echo (format "%s: Search other messages like this" tag)) + button)) + (defun notmuch-tagger-format-tags-header-line (tags) "Format TAGS as a `mode-line-format' template. The result is suitable for inclusion in `header-line-format'." @@ -83,5 +106,15 @@ The result is suitable for inclusion in `header-line-format'." " ") ")")) +(defun notmuch-tagger-format-tags (tags) + "Format TAGS as a string suitable for insertion in a buffer. +If the result of this function is to be used within the +header-line, prefer `notmuch-tagger-format-tags-header-line' +instead of this function." + (concat + "(" + (mapconcat #'notmuch-tagger-make-body-link tags " ") + ")")) + (provide 'notmuch-tagger) ;;; notmuch-tagger.el ends here -- 1.7.10.4