From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 4/4] contrib: pick: make the tree graphics a proper part of the format
Date: Mon, 2 Sep 2013 04:28:08 +0100 [thread overview]
Message-ID: <1378092488-32050-5-git-send-email-markwalters1009@gmail.com> (raw)
In-Reply-To: <1378092488-32050-1-git-send-email-markwalters1009@gmail.com>
Previously the box graphics in the pick view were always attached to
the subject. Make them a field in their own right. We use the
recursive insert to change the default notmuch-pick-result-format so
that the user view does not change. (The subject touches the tree box
graphics but the next column (tags) is still vertically aligned.)
---
contrib/notmuch-pick/notmuch-pick.el | 49 +++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index 5dfcef3..b6f7362 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -65,13 +65,18 @@
(defcustom notmuch-pick-result-format
`(("date" . "%12s ")
("authors" . "%-20s")
- ("subject" . " %-54s ")
+ ((("tree" . "%s")("subject" . "%s")) ." %-54s ")
("tags" . "(%s)"))
"Result formatting for Pick. Supported fields are: date,
- authors, subject, tags Note: subject includes the tree
- structure graphics, and the author string should not
- contain whitespace (put it in the neighbouring fields
- instead). For example:
+ authors, subject, tree, tags. Tree means the thread tree
+ box graphics. The field may also be a list in which case
+ the formatting rules are applied recursively and then the
+ output of all the fields in the list is inserted
+ according to format-string.
+
+Note the author string should not contain
+ whitespace (put it in the neighbouring fields instead).
+ For example:
(setq notmuch-pick-result-format \(\(\"authors\" . \"%-40s\"\)
\(\"subject\" . \"%s\"\)\)\)"
:type '(alist :key-type (string) :value-type (string))
@@ -108,6 +113,12 @@
:group 'notmuch-pick
:group 'notmuch-faces)
+(defface notmuch-pick-match-tree-face
+ '((t :inherit default))
+ "Face used in pick mode for the thread tree block graphics in messages matching the query."
+ :group 'notmuch-pick
+ :group 'notmuch-faces)
+
(defface notmuch-pick-match-tag-face
'((((class color)
(background dark))
@@ -134,6 +145,12 @@
:group 'notmuch-pick
:group 'notmuch-faces)
+(defface notmuch-pick-no-match-tree-face
+ '((t (:foreground "gray")))
+ "Face used in pick mode for the thread tree block graphics in messages matching the query."
+ :group 'notmuch-pick
+ :group 'notmuch-faces)
+
(defface notmuch-pick-no-match-author-face
'((t (:foreground "gray")))
"Face used in pick mode for the date in messages matching the query."
@@ -628,19 +645,27 @@ unchanged ADDRESS if parsing fails."
(propertize (format format-string (plist-get msg :date_relative))
'face face))))
- ((string-equal field "subject")
+ ((string-equal field "tree")
(let ((tree-status (plist-get msg :tree-status))
- (bare-subject (notmuch-show-strip-re (plist-get headers :Subject)))
+ (face (if match
+ 'notmuch-pick-match-tree-face
+ 'notmuch-pick-no-match-tree-face)))
+
+ (setq formatted-field
+ (propertize (format format-string
+ (mapconcat #'identity (reverse tree-status) ""))
+ 'face face))))
+
+ ((string-equal field "subject")
+ (let ((bare-subject (notmuch-show-strip-re (plist-get headers :Subject)))
(face (if match
'notmuch-pick-match-subject-face
'notmuch-pick-no-match-subject-face)))
(setq formatted-field
(propertize (format format-string
- (concat
- (mapconcat #'identity (reverse tree-status) "")
- (if (string= notmuch-pick-previous-subject bare-subject)
- " ..."
- bare-subject)))
+ (if (string= notmuch-pick-previous-subject bare-subject)
+ " ..."
+ bare-subject))
'face face))
(setq notmuch-pick-previous-subject bare-subject)))
--
1.7.9.1
next prev parent reply other threads:[~2013-09-02 3:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 3:28 [PATCH 0/4] contrib: pick: allow more general format lines Mark Walters
2013-09-02 3:28 ` [PATCH 1/4] contrib: pick: print () for a message with no tags Mark Walters
2013-09-02 3:28 ` [PATCH 2/4] contrib: pick: move the insertion of fields up a level Mark Walters
2013-09-02 3:28 ` [PATCH 3/4] contrib: pick: allow recursive message field formats Mark Walters
2013-09-02 3:28 ` Mark Walters [this message]
2013-09-02 3:36 ` [PATCH 0/4] contrib: pick: allow more general format lines Mark Walters
2013-09-14 9:54 ` Tomi Ollila
2013-09-15 12:06 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378092488-32050-5-git-send-email-markwalters1009@gmail.com \
--to=markwalters1009@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).