--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 CC57142119B\r
+ for <notmuch@notmuchmail.org>; Thu, 12 Jul 2012 17:45:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[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 DAdsDdqPZxm2 for <notmuch@notmuchmail.org>;\r
+ Thu, 12 Jul 2012 17:45:25 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id BA661431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 12 Jul 2012 17:45:25 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f306d0000008b4-93-4fff6fa596d1\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id F4.91.02228.5AF6FFF4; Thu, 12 Jul 2012 20:45:25 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q6D0jPKO021124; \r
+ Thu, 12 Jul 2012 20:45:25 -0400\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6D0jND5010663\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 12 Jul 2012 20:45:24 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SpU0Z-0005Rw-Gj; Thu, 12 Jul 2012 20:45:23 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/7] emacs: Use text properties instead of overlays for tag\r
+ coloring\r
+Date: Thu, 12 Jul 2012 20:45:14 -0400\r
+Message-Id: <1342140319-19859-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+References: <1342140319-19859-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrrs0/7+/wfnLYhbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxuyNKQUzpCvW7O5mbWDsEuti5OSQEDCR6N17iBHCFpO4cG89\r
+ WxcjF4eQwD5GiV9LLjKDJIQENjBKnGplhkg8YpJYeHEiK4Qzl1Fi4+wnrCBVbAIaEtv2Lwcb\r
+ JSIgLbHz7mygOAcHs4CaxJ8uFZCwsECIxIV3p1hAbBYBVYkl626zg9i8Ag4S369OhbpCXuLp\r
+ /T42EJtTwFFiw5cLrBBHOEg0HpvJPIGRfwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdE73c\r
+ zBK91JTSTYygkOGU5N/B+O2g0iFGAQ5GJR7e37H//YVYE8uKK3MPMUpyMCmJ8rpkA4X4kvJT\r
+ KjMSizPii0pzUosPMUpwMCuJ8K6zB8rxpiRWVqUW5cOkpDlYlMR5r6bc9BcSSE8sSc1OTS1I\r
+ LYLJynBwKEnwcgJjQ0iwKDU9tSItM6cEIc3EwQkynAdo+LY8kOHFBYm5xZnpEPlTjIpS4rwX\r
+ QBICIImM0jy4XlhMv2IUB3pFmHcnSBUPMB3Adb8CGswENHjWz38gg0sSEVJSDYxlbZc/xu5e\r
+ f/0P14y36snZFRWPpA5dMghcsex8ubm/LsPL/Zt89ZzY9/A8/F0cdo+tuiFTpfLNVV++3+ll\r
+ 89oexngVySz3Nzz8ZrLz1uKzi14fna7apZiR8WzWld3nP/48x5sbyV10VMRMNL98qcuxyG2l\r
+ VeeemIvGHQy+pnrc17feY99nzXIlluKMREMt5qLiRAD+QNtuxAIAAA==\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: Fri, 13 Jul 2012 00:45:27 -0000\r
+\r
+Previously, tag-based search result highlighting was done by creating\r
+an overlay over each search result. However, overlays have annoying\r
+front- and rear-advancement semantics that make it difficult to\r
+manipulate text at their boundaries, which the next patch will do.\r
+They also have performance problems (creating an overlay is linear in\r
+the number of overlays between point and the new overlay, making\r
+highlighting a search buffer quadratic in the number of results).\r
+\r
+Text properties have neither problem. However, text properties make\r
+it more difficult to apply multiple faces since, unlike with overlays,\r
+a given character can only have a single 'face text property. Hence,\r
+we introduce a utility function that combines faces into any existing\r
+'face text properties.\r
+\r
+Using this utility function, it's straightforward to apply all of the\r
+appropriate tag faces in notmuch-search-color-line.\r
+---\r
+ emacs/notmuch-lib.el | 15 +++++++++++++++\r
+ emacs/notmuch.el | 21 +++++++--------------\r
+ 2 files changed, 22 insertions(+), 14 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index aa25513..30db58f 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -269,6 +269,21 @@ current buffer, if possible."\r
+ (loop for (key value . rest) on plist by #'cddr\r
+ collect (cons (intern (substring (symbol-name key) 1)) value)))\r
+ \r
++(defun notmuch-combine-face-text-property (start end face)\r
++ "Combine FACE into the 'face text property between START and END.\r
++\r
++This function combines FACE with any existing faces between START\r
++and END. Attributes specified by FACE take precedence over\r
++existing attributes. FACE must be a face name (a symbol or\r
++string), a property list of face attributes, or a list of these."\r
++\r
++ (let ((pos start))\r
++ (while (< pos end)\r
++ (let ((cur (get-text-property pos 'face))\r
++ (next (next-single-property-change pos 'face nil end)))\r
++ (put-text-property pos next 'face (cons face cur))\r
++ (setq pos next)))))\r
++\r
+ ;; Compatibility functions for versions of emacs before emacs 23.\r
+ ;;\r
+ ;; Both functions here were copied from emacs 23 with the following copyright:\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index ef18927..82c148d 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -633,20 +633,13 @@ 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
+- ;; Create the overlay only if the message has tags which match one\r
+- ;; of those specified in `notmuch-search-line-faces'.\r
+- (let (overlay)\r
+- (mapc (lambda (elem)\r
+- (let ((tag (car elem))\r
+- (attributes (cdr elem)))\r
+- (when (member tag line-tag-list)\r
+- (when (not overlay)\r
+- (setq overlay (make-overlay start end)))\r
+- ;; Merge the specified properties with any already\r
+- ;; applied from an earlier match.\r
+- (overlay-put overlay 'face\r
+- (append (overlay-get overlay 'face) attributes)))))\r
+- notmuch-search-line-faces)))\r
++ (mapc (lambda (elem)\r
++ (let ((tag (car elem))\r
++ (attributes (cdr elem)))\r
++ (when (member tag line-tag-list)\r
++ (notmuch-combine-face-text-property start end attributes))))\r
++ ;; Reverse the list so earlier entries take precedence\r
++ (reverse 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.10\r
+\r
projects / notmuch-archives.git / commitdiff