On Fri, 27 Jan 2012 10:37:43 +0000, David Edmondson <dme@dme.org> wrote:
> On Fri, 27 Jan 2012 10:29:22 +0000, Mark Walters <markwalters1009@gmail.com> wrote:
> > I am not sure if this is the place
>
> Here or #notmuch.
>
> > to ask but is there a corresponding option for colouring the summary
> > line in notmuch-show depending on tags/flags?
>
> There's id:"1325006003-27152-1-git-send-email-dme@dme.org", but it's a
> bit old and may not apply cleanly any more.
That's great! One hunk didn't apply but the merge was so trivial I am not sure
why it did not apply. Anyway in case anyone else wants it I include the
rebased version below (I also moved the defcustom under notmuch-show).
Best wishes
Mark
Subject: [PATCH] rebased id:"1325006003-27152-1-git-send-email-dme@dme.org"
---
emacs/notmuch-lib.el | 18 ++++++++++++++++++
emacs/notmuch-show.el | 33 +++++++++++++++++++++++++++++----
emacs/notmuch.el | 17 ++---------------
3 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index c906ca7..ab1d8e8 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -133,6 +133,24 @@ the user hasn't set this variable with the old or new value."
(interactive)
(kill-buffer (current-buffer)))
+(defun notmuch-color-line (start end line-tag-list spec)
+ "Colorize a line based on tags."
+ ;; Create the overlay only if the message has tags which match one
+ ;; of those specified in `spec'.
+ (let (overlay)
+ (mapc (lambda (elem)
+ (let ((tag (car elem))
+ (attributes (cdr elem)))
+ (when (member tag line-tag-list)
+ (when (not overlay)
+ (setq overlay (make-overlay start end))
+ (overlay-put overlay 'priority 5))
+ ;; Merge the specified properties with any already
+ ;; applied from an earlier match.
+ (overlay-put overlay 'face
+ (append (overlay-get overlay 'face) attributes)))))
+ spec)))
+
;;
(defun notmuch-common-do-stash (text)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 84ac624..c448ab2 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -92,6 +92,24 @@ any given message."
:group 'notmuch-show
:group 'notmuch-hooks)
+(defcustom notmuch-show-line-faces nil
+ "Tag to face mapping for header line highlighting in `notmuch-show-mode'.
+
+Here is an example of how to color search results based on tags.
+ (the following text would be placed in your ~/.emacs file):
+
+ (setq notmuch-search-line-faces '((\"delete\" . (:foreground \"red\"
+ :background \"blue\"))
+ (\"unread\" . (:foreground \"green\"))))
+
+The attributes defined for matching tags are merged, with later
+attributes overriding earlier. A message having both \"delete\"
+and \"unread\" tags with the above settings would have a green
+foreground and blue background."
+ :type '(alist :key-type (string) :value-type (custom-face-edit))
+ :group 'notmuch-show
+ :group 'notmuch-faces)
+
;; Mostly useful for debugging.
(defcustom notmuch-show-all-multipart/alternative-parts t
"Should all parts of multipart/alternative parts be shown?"
@@ -340,7 +358,8 @@ unchanged ADDRESS if parsing fails."
(defun notmuch-show-insert-headerline (headers date tags depth)
"Insert a notmuch style headerline based on HEADERS for a
message at DEPTH in the current thread."
- (let ((start (point)))
+ (let ((start (point))
+ overlay)
(insert (notmuch-show-spaces-n (* notmuch-show-indent-messages-width depth))
(notmuch-show-clean-address (plist-get headers :From))
" ("
@@ -349,7 +368,9 @@ message at DEPTH in the current thread."
(propertize (mapconcat 'identity tags " ")
'face 'notmuch-tag-face)
")\n")
- (overlay-put (make-overlay start (point)) 'face 'notmuch-message-summary-face)))
+ (setq overlay (make-overlay start (point)))
+ (overlay-put overlay 'face 'notmuch-message-summary-face)
+ (overlay-put overlay 'priority 2)))
(defun notmuch-show-insert-header (header header-value)
"Insert a single header."
@@ -818,7 +839,8 @@ current buffer, if possible."
body-start body-end
(headers-invis-spec (notmuch-show-make-symbol "header"))
(message-invis-spec (notmuch-show-make-symbol "message"))
- (bare-subject (notmuch-show-strip-re (plist-get headers :Subject))))
+ (bare-subject (notmuch-show-strip-re (plist-get headers :Subject)))
+ (tags (plist-get msg :tags)))
;; Set `buffer-invisibility-spec' to `nil' (a list), otherwise
;; removing items from `buffer-invisibility-spec' (which is what
@@ -843,10 +865,13 @@ current buffer, if possible."
(plist-get msg :date_relative)
nil)
(plist-get headers :Date))
- (plist-get msg :tags) depth)
+ tags depth)
(setq content-start (point-marker))
+ ;; Colour the header line according to the tags of the message.
+ (notmuch-color-line message-start content-start tags notmuch-show-line-faces)
+
(plist-put msg :headers-invis-spec headers-invis-spec)
(plist-put msg :message-invis-spec message-invis-spec)
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 72f78ed..244fafa 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -690,7 +690,7 @@ This function advances the next thread when finished."
(forward-line (1- notmuch-search-target-line))))))))
(defcustom notmuch-search-line-faces nil
- "Tag/face mapping for line highlighting in notmuch-search.
+ "Tag to face mapping for line highlighting in `notmuch-search-mode'.
Here is an example of how to color search results based on tags.
(the following text would be placed in your ~/.emacs file):
@@ -709,20 +709,7 @@ foreground and blue background."
(defun notmuch-search-color-line (start end line-tag-list)
"Colorize lines in `notmuch-show' based on tags."
- ;; Create the overlay only if the message has tags which match one
- ;; of those specified in `notmuch-search-line-faces'.
- (let (overlay)
- (mapc (lambda (elem)
- (let ((tag (car elem))
- (attributes (cdr elem)))
- (when (member tag line-tag-list)
- (when (not overlay)
- (setq overlay (make-overlay start end)))
- ;; Merge the specified properties with any already
- ;; applied from an earlier match.
- (overlay-put overlay 'face
- (append (overlay-get overlay 'face) attributes)))))
- notmuch-search-line-faces)))
+ (notmuch-color-line start end line-tag-list notmuch-search-line-faces))
(defun notmuch-search-author-propertize (authors)
"Split `authors' into matching and non-matching authors and
--
1.7.2.3