--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id C8768431FC9\r
+ for <notmuch@notmuchmail.org>; Sat, 5 May 2012 06:39:49 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id eENW9UCqLd8z for <notmuch@notmuchmail.org>;\r
+ Sat, 5 May 2012 06:39:47 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+ [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 45A58431FD0\r
+ for <notmuch@notmuchmail.org>; Sat, 5 May 2012 06:39:46 -0700 (PDT)\r
+Received: by wibhn6 with SMTP id hn6so1781616wib.2\r
+ for <notmuch@notmuchmail.org>; Sat, 05 May 2012 06:39:45 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=uPap+PNqBubb4q9RTD1EZOyBGKttS0QrCtPmVuLo9iY=;\r
+ b=nWJ7renOMlK+/py3gdN4OofYgJlHSxmhbfu+r/dfym1SY/MvFBH48vqFeJ74NK0BNj\r
+ J4NlTiJlu4oeRKJwuSDZG2ryuZPMK+M3de7nvNLKx5w/sefHb5NosiwijjE7b35j/sKR\r
+ mJ1ZRvML/KKw+GRIjqFcjPrKIKjle7L+iTmY+jMQzcP2CFiPo459iA3gk7gov519D1rG\r
+ oymYQlTT5y5D49yx3CBW5mzMobou/qN9Pak5Ig+K6Cpry1sQmaxPeYbKZr5QjShaRLZT\r
+ tnveVpskZQzgLe1qN3I06rLR5abU2G6rEs+xj9F2lGT9MRAaF8RyAVbg9Rg8+565JeYE\r
+ hcCQ==\r
+Received: by 10.180.105.198 with SMTP id go6mr21196327wib.19.1336225184931;\r
+ Sat, 05 May 2012 06:39:44 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223]) by mx.google.com with ESMTPS id\r
+ ff9sm5804953wib.2.2012.05.05.06.39.43 (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 05 May 2012 06:39:44 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 3/4] emacs: move notmuch-search-line-faces to "tag:" style.\r
+Date: Sat, 5 May 2012 14:39:46 +0100\r
+Message-Id: <1336225187-8772-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1336225187-8772-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1336225187-8772-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 05 May 2012 13:39:50 -0000\r
+\r
+notmuch-search-line-faces currently has pairs of the form ("TAG"\r
+. FACE). This changes it so that the pairs need to be of the form\r
+("tag:tag" . FACE). This makes it consistent with the same change to\r
+notmuch-show-line-faces introduced in the next patch\r
+where we allow colouring based on flags (match\r
+and excluded) as well as tags. However, it will break people's\r
+existing colouring lines.\r
+\r
+It also makes it easier for the user to make the colouring rule for\r
+search and show the same.\r
+---\r
+ emacs/notmuch.el | 17 ++++++++++++-----\r
+ 1 files changed, 12 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index d5f40e2..40f0cbe 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -591,16 +591,16 @@ This function advances the next thread when finished."\r
+ (goto-char (point-min))\r
+ (forward-line (1- notmuch-search-target-line))))))))\r
+ \r
+-(defcustom notmuch-search-line-faces '(("unread" :weight bold)\r
+- ("flagged" :foreground "blue"))\r
++(defcustom notmuch-search-line-faces '(("tag:unread" :weight bold)\r
++ ("tag:flagged" :foreground "blue"))\r
+ "Tag/face mapping for line highlighting in notmuch-search.\r
+ \r
+ Here is an example of how to color search results based on tags.\r
+ (the following text would be placed in your ~/.emacs file):\r
+ \r
+- (setq notmuch-search-line-faces '((\"deleted\" . (:foreground \"red\"\r
++ (setq notmuch-search-line-faces '((\"tag:deleted\" . (:foreground \"red\"\r
+ :background \"blue\"))\r
+- (\"unread\" . (:foreground \"green\"))))\r
++ (\"tag:unread\" . (:foreground \"green\"))))\r
+ \r
+ The attributes defined for matching tags are merged, with later\r
+ attributes overriding earlier. A message having both \"deleted\"\r
+@@ -612,7 +612,14 @@ foreground and blue background."\r
+ \r
+ (defun notmuch-search-color-line (start end line-tag-list)\r
+ "Colorize lines in `notmuch-show' based on tags."\r
+- (notmuch-color-line start end line-tag-list notmuch-search-line-faces))\r
++ ;; This is a little ugly (we do not match on flags in search-mode)\r
++ ;; but is done to keep the syntax consistent in\r
++ ;; notmuch-search-line-faces and notmuch-show-line-faces.\r
++ (let (tags-and-flags)\r
++ (mapc (lambda (tag)\r
++ (setq tags-and-flags (cons (concat "tag:" tag) tags-and-flags)))\r
++ line-tag-list)\r
++ (notmuch-color-line start end tags-and-flags notmuch-search-line-faces)))\r
+ \r
+ (defun notmuch-search-author-propertize (authors)\r
+ "Split `authors' into matching and non-matching authors and\r
+-- \r
+1.7.9.1\r
+\r
projects / notmuch-archives.git / commitdiff