From: Mark Walters Date: Sun, 29 Apr 2012 22:48:17 +0000 (+0100) Subject: [Patch v2 3/3] emacs: allow notmuch-show-line-faces to use flags for colouring X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5e124780c2bc08f0fbacdaf3c1dc0ee1c222236c;p=notmuch-archives.git [Patch v2 3/3] emacs: allow notmuch-show-line-faces to use flags for colouring --- diff --git a/97/87b0d1d038fcdd0fd56129ef40cb328263bb55 b/97/87b0d1d038fcdd0fd56129ef40cb328263bb55 new file mode 100644 index 000000000..d718a31da --- /dev/null +++ b/97/87b0d1d038fcdd0fd56129ef40cb328263bb55 @@ -0,0 +1,134 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 7534D429E36 + for ; Sun, 29 Apr 2012 15:48:23 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 8kHd+++RHBd9 for ; + Sun, 29 Apr 2012 15:48:21 -0700 (PDT) +Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 3F268431FDA for ; Sun, 29 Apr 2012 15:48:13 -0700 + (PDT) +Received: by wgbdt14 with SMTP id dt14so1973630wgb.2 + for ; Sun, 29 Apr 2012 15:48:10 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=gAsLlCwH02M8uthqw3CVudh6WzBKVA+69J8gGwpsjew=; + b=i8q+aAHnJ2SlLaTAM5maCD49wcBtJ2K6LMgLg93oejzrr2dZeVNBFFk7wWMQRyYRzW + GWrCCLKiuHC02VUjIOJO0yUwaxDIF5unLRvdATtToUZaAHqiRwB6VrgupAsC5ZQ5jqVb + K8mVFCq+R3Blx40mEjdD76X3T4XwhqO6LeKWf+tmKWoZkLyrrMOcwjtYLqyPNDmto270 + yuYqoj4rzFOx7NJT7xm1q9kVaNHKJdnVAMtQwiS44YFFCrrS5d1Fb8SIRfBs+rd2LJB8 + oSJDbLBZvXnmkhh75V+nhMckcrOJ/sMH2ZMIE18cHqITjeUFpSe3JUmreEexpJ+w6c3F + lFmQ== +Received: by 10.180.101.136 with SMTP id fg8mr24031124wib.4.1335739690631; + Sun, 29 Apr 2012 15:48:10 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fz9sm24224283wib.3.2012.04.29.15.48.09 (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Apr 2012 15:48:10 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [Patch v2 3/3] emacs: allow notmuch-show-line-faces to use flags for + colouring +Date: Sun, 29 Apr 2012 23:48:17 +0100 +Message-Id: <1335739697-8501-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1335739697-8501-1-git-send-email-markwalters1009@gmail.com> +References: <1335739697-8501-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 29 Apr 2012 22:48:23 -0000 + +This allows header-lines `notmuch-show-mode' buffers to be coloured +based on the flags (match/excluded) of the message. It supplies the +line colouring function with a list of tags each prefixed with "tag:" +and a list of flags ("match" or "excluded") each prefixed with +"flag:". + +The match flag is obviously not equivalent to a tag; the excluded flag +looks equivalent but is subtly different: a message is not marked +excluded if that tag appeared in the query. +--- + emacs/notmuch-show.el | 21 ++++++++++++++++----- + 1 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index bb7db6e..f09de26 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -96,14 +96,16 @@ any given message." + (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. ++Here is an example of how to color search results based on tags ++and flags (match and excluded). + (the following text would be placed in your ~/.emacs file): + +- (setq notmuch-search-line-faces '((\"delete\" . (:foreground \"red\" ++ (setq notmuch-search-line-faces '((\"tag:delete\" . (:foreground \"red\" + :background \"blue\")) +- (\"unread\" . (:foreground \"green\")))) ++ (\"tag:unread\" . (:foreground \"green\")) ++ (\"flag:excluded\" . (:background \"grey\")))) + +-The attributes defined for matching tags are merged, with later ++The attributes defined for matching tags/flags 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." +@@ -871,11 +873,20 @@ current buffer, if possible." + content-start content-end + headers-start headers-end + body-start body-end ++ tags-and-flags + (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))) + (tags (plist-get msg :tags))) + ++ (mapc (lambda (tag) ++ (setq tags-and-flags (cons (concat "tag:" tag) tags-and-flags))) ++ tags) ++ (if (plist-get msg :match) ++ (setq tags-and-flags (cons "flag:match" tags-and-flags))) ++ (if (plist-get msg :excluded) ++ (setq tags-and-flags (cons "flag:excluded" tags-and-flags))) ++ + ;; Set `buffer-invisibility-spec' to `nil' (a list), otherwise + ;; removing items from `buffer-invisibility-spec' (which is what + ;; `notmuch-show-headers-visible' and +@@ -904,7 +915,7 @@ current buffer, if possible." + (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) ++ (notmuch-color-line message-start content-start tags-and-flags notmuch-show-line-faces) + + (plist-put msg :headers-invis-spec headers-invis-spec) + (plist-put msg :message-invis-spec message-invis-spec) +-- +1.7.9.1 +