From ee47862588dff2006a9bdb14f01eedecb9814c07 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 14 Apr 2012 20:21:41 +0100 Subject: [PATCH] [PATCH 3/3] emacs: allow notmuch-show-line-faces to use flags for colouring --- 65/87d4947a17e2a57f5113b07c0c1a4629ecce45 | 134 ++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 65/87d4947a17e2a57f5113b07c0c1a4629ecce45 diff --git a/65/87d4947a17e2a57f5113b07c0c1a4629ecce45 b/65/87d4947a17e2a57f5113b07c0c1a4629ecce45 new file mode 100644 index 000000000..9ab69ae36 --- /dev/null +++ b/65/87d4947a17e2a57f5113b07c0c1a4629ecce45 @@ -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 3ACD4431FC2 + for ; Sat, 14 Apr 2012 12:21:51 -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 pROiv4MNmym7 for ; + Sat, 14 Apr 2012 12:21:50 -0700 (PDT) +Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com + [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 629DF429E27 + for ; Sat, 14 Apr 2012 12:21:45 -0700 (PDT) +Received: by wibhq7 with SMTP id hq7so6114674wib.2 + for ; Sat, 14 Apr 2012 12:21:44 -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=bBzpGblhZzOa3AopxPFdYPMqUEo4zJv3c7k9X22Gv7U=; + b=HPRwL6u2JwWdlx7N7CDDsq98c4dPrV2MGjKt9g+IF4rZZBlv465at+Ry/PSfUy87Cz + 9lud+ysfYjwUEvoxTAxmrwPknqWCOAIsGXpLaEurKP5EMbgL6ZjL77lqyXUGY4eAYUJI + rfrjtIFKt2Ze8ditUjIBUHGFER6O2tXcY52cPRAK3buI3DW2RXjxoiuZ22ytN0UCxvxl + XKQYn7uBNb58xRQM4IzOFm6bdftq0sKLojhYLz7IxYK2228TGcURJVjjtWQWw2sXdJvR + EDV9h2BceHUE8rceB5pmMj8XxcYOftZHd3mSTIYDcw3JDNi811bJtsYddIk1NUo7Kmr7 + lEHg== +Received: by 10.180.92.228 with SMTP id cp4mr6048784wib.2.1334431303948; + Sat, 14 Apr 2012 12:21:43 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + l5sm6598183wia.11.2012.04.14.12.21.42 (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 14 Apr 2012 12:21:43 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 3/3] emacs: allow notmuch-show-line-faces to use flags for + colouring +Date: Sat, 14 Apr 2012 20:21:41 +0100 +Message-Id: <1334431301-27303-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1334431301-27303-1-git-send-email-markwalters1009@gmail.com> +References: <1334431301-27303-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: Sat, 14 Apr 2012 19:21:51 -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 3dbb25f..66b8ec7 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -97,14 +97,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." +@@ -872,11 +874,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 +@@ -905,7 +916,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 + -- 2.26.2