From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 64350431FD8 for ; Sat, 21 Jul 2012 10:37:23 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[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 i3xXvnbdH4b8 for ; Sat, 21 Jul 2012 10:37:21 -0700 (PDT) Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU [18.7.68.37]) by olra.theworths.org (Postfix) with ESMTP id E0DF9431FC0 for ; Sat, 21 Jul 2012 10:37:19 -0700 (PDT) X-AuditID: 12074425-b7f9b6d0000008c4-d5-500ae8ceb185 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP id B0.FE.02244.EC8EA005; Sat, 21 Jul 2012 13:37:18 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q6LHbHpj018462; Sat, 21 Jul 2012 13:37:17 -0400 Received: from drake.dyndns.org (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6LHbF0g008012 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Sat, 21 Jul 2012 13:37:16 -0400 (EDT) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1SsdcB-0001Zg-8M; Sat, 21 Jul 2012 13:37:15 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v4 2/8] emacs: Use text properties instead of overlays for tag coloring Date: Sat, 21 Jul 2012 13:37:06 -0400 Message-Id: <1342892232-5659-3-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1342892232-5659-1-git-send-email-amdragon@mit.edu> References: <1341354059-29396-1-git-send-email-amdragon@mit.edu> <1342892232-5659-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsUixCmqrXvuBVeAwc4j4hZ79nlZrJ7LY3H9 5kxmB2aPu6e5PHbOusvu8WzVLeYA5igum5TUnMyy1CJ9uwSujNkbUwpmSFes2d3N2sDYJdbF yMkhIWAisWDSBHYIW0ziwr31bF2MXBxCAvsYJRq6pjNCOBsYJe7v3gSVecQkcfz9JKjMXEaJ twsmMYH0swloSGzbv5wRxBYRkJbYeXc2K4jNLJAm8b39LVhcWCBcYsu0lWwgNouAqsSXhoNg u3kF7CWm/F7BCHGHvMTT+31gNZwCDhKPzh5gAbGFBMokFnccZpzAyL+AkWEVo2xKbpVubmJm TnFqsm5xcmJeXmqRroVebmaJXmpK6SZGUGCxu6juYJxwSOkQowAHoxIPr4USV4AQa2JZcWXu IUZJDiYlUd6++0AhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrybTgPleFMSK6tSi/JhUtIcLEri vDdSbvoLCaQnlqRmp6YWpBbBZGU4OJQkePmAESQkWJSanlqRlplTgpBm4uAEGc4DNFwMpIa3 uCAxtzgzHSJ/ilFRSpz333OghABIIqM0D64XFvmvGMWBXhHmNQBp5wEmDbjuV0CDmYAGS2eB DS5JREhJNTCKc9277lF5emtb+w7t0oiv6nKXJy19stzScsv6otryTWK2e67LZO5+bR39SUzq YJLm4UufakN9P81bMMHItaVuZs/Tv8fbTomw76zedj9W9mNy31ExFp37xwXur75uUnN9sUDP mi/LZx7TX/1ecys7O6virKBJmlNq/4v/jT3ypvvI/oQcv1ZTJZbijERDLeai4kQA1d+d3tcC AAA= 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, 21 Jul 2012 17:37:23 -0000 Previously, tag-based search result highlighting was done by creating an overlay over each search result. However, overlays have annoying front- and rear-advancement semantics that make it difficult to manipulate text at their boundaries, which the next patch will do. They also have performance problems (creating an overlay is linear in the number of overlays between point and the new overlay, making highlighting a search buffer quadratic in the number of results). Text properties have neither problem. However, text properties make it more difficult to apply multiple faces since, unlike with overlays, a given character can only have a single 'face text property. Hence, we introduce a utility function that combines faces into any existing 'face text properties. Using this utility function, it's straightforward to apply all of the appropriate tag faces in notmuch-search-color-line. --- emacs/notmuch-lib.el | 15 +++++++++++++++ emacs/notmuch.el | 21 +++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index aa25513..30db58f 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -269,6 +269,21 @@ current buffer, if possible." (loop for (key value . rest) on plist by #'cddr collect (cons (intern (substring (symbol-name key) 1)) value))) +(defun notmuch-combine-face-text-property (start end face) + "Combine FACE into the 'face text property between START and END. + +This function combines FACE with any existing faces between START +and END. Attributes specified by FACE take precedence over +existing attributes. FACE must be a face name (a symbol or +string), a property list of face attributes, or a list of these." + + (let ((pos start)) + (while (< pos end) + (let ((cur (get-text-property pos 'face)) + (next (next-single-property-change pos 'face nil end))) + (put-text-property pos next 'face (cons face cur)) + (setq pos next))))) + ;; Compatibility functions for versions of emacs before emacs 23. ;; ;; Both functions here were copied from emacs 23 with the following copyright: diff --git a/emacs/notmuch.el b/emacs/notmuch.el index ef18927..82c148d 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -633,20 +633,13 @@ foreground and blue background." (defun notmuch-search-color-line (start end line-tag-list) "Colorize lines in `notmuch-show' based on tags." - ;; Create the overlay only if the message has tags which match one - ;; of those specified in `notmuch-search-line-faces'. - (let (overlay) - (mapc (lambda (elem) - (let ((tag (car elem)) - (attributes (cdr elem))) - (when (member tag line-tag-list) - (when (not overlay) - (setq overlay (make-overlay start end))) - ;; Merge the specified properties with any already - ;; applied from an earlier match. - (overlay-put overlay 'face - (append (overlay-get overlay 'face) attributes))))) - notmuch-search-line-faces))) + (mapc (lambda (elem) + (let ((tag (car elem)) + (attributes (cdr elem))) + (when (member tag line-tag-list) + (notmuch-combine-face-text-property start end attributes)))) + ;; Reverse the list so earlier entries take precedence + (reverse notmuch-search-line-faces))) (defun notmuch-search-author-propertize (authors) "Split `authors' into matching and non-matching authors and -- 1.7.10