[PATCH 0/2] emacs: tree: use notmuch-tag-format-tags

[PATCH 0/2] emacs: tree: use notmuch-tag-format-tags

[Mark Walters]

This is a reworking of the second patch in the series
id:1387480344-14326-1-git-send-email-markwalters1009@gmail.com (it
applies on top of the first patch in that series which has been marked
ready)

The first patch gives tree default matching/non-matching faces. This
should make it easier for users to customize the tree display. It also
makes the switch to using notmuch-tag-format-tags easier in patch 2 of
this series.

Best wishes

Mark






Mark Walters (2):
  emacs: tree: default face for matching/non-matching messages
  emacs: tree: use tag-format-tags

 emacs/notmuch-tag.el  |   17 +++++++++--------
 emacs/notmuch-tree.el |   41 +++++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 22 deletions(-)

-- 
1.7.9.1

[PATCH 1/2] emacs: tree: default face for matching/non-matching messages

[Mark Walters]

This adds default faces for matching and non-matching messages. This
makes it easier for a user to do broad customization without having to
customize every field. It also fits more neatly with the next patch
which switches to using notmuch-tag-format-tags for tag formatting.

We set the field specific face customization to nil for all the fields
which use the message default face to make it clear to a user which
fields customizations are being used.
---
 emacs/notmuch-tree.el |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 0ce7fa8..16f2862 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -70,8 +70,14 @@ Note the author string should not contain
   :group 'notmuch-tree)
 
 ;; Faces for messages that match the query.
-(defface notmuch-tree-match-date-face
+(defface notmuch-tree-match-face
   '((t :inherit default))
+  "Default face used in tree mode face for matching messages"
+  :group 'notmuch-tree
+  :group 'notmuch-faces)
+
+(defface notmuch-tree-match-date-face
+  nil
   "Face used in tree mode for the date in messages matching the query."
   :group 'notmuch-tree
   :group 'notmuch-faces)
@@ -90,13 +96,13 @@ Note the author string should not contain
   :group 'notmuch-faces)
 
 (defface notmuch-tree-match-subject-face
-  '((t :inherit default))
+  nil
   "Face used in tree mode for the subject in messages matching the query."
   :group 'notmuch-tree
   :group 'notmuch-faces)
 
 (defface notmuch-tree-match-tree-face
-  '((t :inherit default))
+  nil
   "Face used in tree mode for the thread tree block graphics in messages matching the query."
   :group 'notmuch-tree
   :group 'notmuch-faces)
@@ -115,32 +121,38 @@ Note the author string should not contain
   :group 'notmuch-faces)
 
 ;; Faces for messages that do not match the query.
-(defface notmuch-tree-no-match-date-face
+(defface notmuch-tree-no-match-face
   '((t (:foreground "gray")))
+  "Default face used in tree mode face for non-matching messages"
+  :group 'notmuch-tree
+  :group 'notmuch-faces)
+
+(defface notmuch-tree-no-match-date-face
+  nil
   "Face used in tree mode for non-matching dates."
   :group 'notmuch-tree
   :group 'notmuch-faces)
 
 (defface notmuch-tree-no-match-subject-face
-  '((t (:foreground "gray")))
+  nil
   "Face used in tree mode for non-matching subjects."
   :group 'notmuch-tree
   :group 'notmuch-faces)
 
 (defface notmuch-tree-no-match-tree-face
-  '((t (:foreground "gray")))
+  nil
   "Face used in tree mode for the thread tree block graphics in messages matching the query."
   :group 'notmuch-tree
   :group 'notmuch-faces)
 
 (defface notmuch-tree-no-match-author-face
-  '((t (:foreground "gray")))
+  nil
   "Face used in tree mode for the date in messages matching the query."
   :group 'notmuch-tree
   :group 'notmuch-faces)
 
 (defface notmuch-tree-no-match-tag-face
-  '((t (:foreground "gray")))
+  nil
   "Face used in tree mode face for non-matching tags."
   :group 'notmuch-tree
   :group 'notmuch-faces)
@@ -699,10 +711,14 @@ unchanged ADDRESS if parsing fails."
 
 (defun notmuch-tree-format-field-list (field-list msg)
   "Format fields of MSG according to FIELD-LIST and return string"
-  (let (result-string)
+  (let ((face (if (plist-get msg :match)
+		  'notmuch-tree-match-face
+		'notmuch-tree-no-match-face))
+	(result-string))
     (dolist (spec field-list result-string)
       (let ((field-string (notmuch-tree-format-field (car spec) (cdr spec) msg)))
-	(setq result-string (concat result-string field-string))))))
+	(setq result-string (concat result-string field-string))))
+    (notmuch-combine-face-text-property-string result-string face t)))
 
 (defun notmuch-tree-insert-msg (msg)
   "Insert the message MSG according to notmuch-tree-result-format"
-- 
1.7.9.1

[PATCH 2/2] emacs: tree: use tag-format-tags

[Mark Walters]

Previously tree did not use tag-format-tags: since tree wants to
distinguish matching messages from non-matching messages it is not a
perfect fit.

However, in preparation for allowing tag-changes to be shown (i.e.,
added or deleted tags to be indicated) it is convenient to make all
places displaying tags call the same routines.

We modify notmuch-tag-format-tags slightly so that it can take and
argument for the default characteristics of the face before the
special tag features are applied.

This also means that things like the star symbol for flagged messages
all work in tree.

---

(Sorry if this arrives multiple times: I am having problems sending mail)

 emacs/notmuch-tag.el  |   17 +++++++++--------
 emacs/notmuch-tree.el |    5 +----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el
index b60f46c..908e7ad 100644
--- a/emacs/notmuch-tag.el
+++ b/emacs/notmuch-tag.el
@@ -148,15 +148,16 @@ This can be used with `notmuch-tag-format-image-data'."
 	(dolist (format (cdr formats) tag)
 	  (setq tag (eval format))))))))
 
-(defun notmuch-tag-format-tags (tags)
+(defun notmuch-tag-format-tags (tags &optional face)
   "Return a string representing formatted TAGS."
-  (notmuch-combine-face-text-property-string
-   (mapconcat #'identity
-	      ;; nil indicated that the tag was deliberately hidden
-	      (delq nil (mapcar #'notmuch-tag-format-tag tags))
-	      " ")
-   'notmuch-tag-face
-   t))
+  (let ((face (or face 'notmuch-tag-face)))
+    (notmuch-combine-face-text-property-string
+     (mapconcat #'identity
+		;; nil indicated that the tag was deliberately hidden
+		(delq nil (mapcar #'notmuch-tag-format-tag tags))
+		" ")
+     face
+     t)))
 
 (defcustom notmuch-before-tag-hook nil
   "Hooks that are run before tags of a message are modified.
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 16f2862..4f2ac02 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -704,10 +704,7 @@ unchanged ADDRESS if parsing fails."
 	    (face (if match
 		      'notmuch-tree-match-tag-face
 		    'notmuch-tree-no-match-tag-face)))
-	(propertize (format format-string
-			    (mapconcat #'identity tags " "))
-		    'face face))))))
-
+	(format format-string (notmuch-tag-format-tags tags face)))))))
 
 (defun notmuch-tree-format-field-list (field-list msg)
   "Format fields of MSG according to FIELD-LIST and return string"
-- 
1.7.9.1

Re: [PATCH 1/2] emacs: tree: default face for matching/non-matching messages

[David Bremner]

Mark Walters <markwalters1009@gmail.com> writes:

> This adds default faces for matching and non-matching messages. This
> makes it easier for a user to do broad customization without having to
> customize every field. It also fits more neatly with the next patch
> which switches to using notmuch-tag-format-tags for tag formatting.

pushed both,

d

Re: [PATCH 0/2] emacs: tree: use notmuch-tag-format-tags

[Tomi Ollila]

On Sat, Jan 11 2014, Mark Walters <markwalters1009@gmail.com> wrote:

> This is a reworking of the second patch in the series
> id:1387480344-14326-1-git-send-email-markwalters1009@gmail.com (it
> applies on top of the first patch in that series which has been marked
> ready)
>
> The first patch gives tree default matching/non-matching faces. This
> should make it easier for users to customize the tree display. It also
> makes the switch to using notmuch-tag-format-tags easier in patch 2 of
> this series.

These patches look good to me and works nicely -- I wish search buffer
had the same tag coloring...

>
> Best wishes
>
> Mark

Tomi


>
>
>
>
>
>
> Mark Walters (2):
>   emacs: tree: default face for matching/non-matching messages
>   emacs: tree: use tag-format-tags
>
>  emacs/notmuch-tag.el  |   17 +++++++++--------
>  emacs/notmuch-tree.el |   41 +++++++++++++++++++++++++++--------------
>  2 files changed, 36 insertions(+), 22 deletions(-)
>
> -- 
> 1.7.9.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch