Re: [PATCH v2] emacs: Fix display of highlighted line in notmuch-search

diff --git a/ee/eee0a169785e25ee7b5652f284881fa7c687ee b/ee/eee0a169785e25ee7b5652f284881fa7c687ee
new file mode 100644 (file)
index 0000000..551949a
--- /dev/null
+++ b/ee/eee0a169785e25ee7b5652f284881fa7c687ee
@@ -0,0 +1,138 @@
+Return-Path: <dmitry.kurochkin@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 02586431E82\r
+       for <notmuch@notmuchmail.org>; Wed, 15 Feb 2012 11:28:51 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 6zqbPSZgnwtZ for <notmuch@notmuchmail.org>;\r
+       Wed, 15 Feb 2012 11:28:46 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 37FBA431E62\r
+       for <notmuch@notmuchmail.org>; Wed, 15 Feb 2012 11:28:46 -0800 (PST)\r
+Received: by bkcit16 with SMTP id it16so1404927bkc.26\r
+       for <notmuch@notmuchmail.org>; Wed, 15 Feb 2012 11:28:44 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=uiRhPGALUfVeSBcPZrQhRCN8YjgKsnzO0Newk3NUU4o=;\r
+       b=NsB2xxyeCsBmI2LrToArcJ2yXvcmrym0C7UbUHjbZsgWalHtarWmxnhh9cc/rHKOtH\r
+       6ywLKy3nINnO6libx3iAIF3wwNehGLsOcU8Z0ooXT8MffYE9GcJSd5s1N9G847QhVxyL\r
+       JmN4I7SZfIVp7npZ7pbfDavRlbtju2fJUADyA=\r
+Received: by 10.204.10.80 with SMTP id o16mr11966953bko.50.1329334120190;\r
+       Wed, 15 Feb 2012 11:28:40 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id x22sm8400017bkw.11.2012.02.15.11.28.38\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 15 Feb 2012 11:28:39 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: Michal Sojka <sojka@os.inf.tu-dresden.de>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] emacs: Fix display of highlighted line in\r
+       notmuch-search\r
+In-Reply-To: <1329239387-6300-1-git-send-email-sojka@os.inf.tu-dresden.de>\r
+References: <87mx8lpd5o.fsf@nikula.org>\r
+       <1329239387-6300-1-git-send-email-sojka@os.inf.tu-dresden.de>\r
+User-Agent: Notmuch/0.11.1+188~ga5674c2 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 15 Feb 2012 23:27:18 +0400\r
+Message-ID: <87wr7ngand.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Wed, 15 Feb 2012 19:28:51 -0000\r
+\r
+Hi Michal.\r
+\r
+On Tue, 14 Feb 2012 18:09:47 +0100, Michal Sojka <sojka@os.inf.tu-dresden.de> wrote:\r
+> When notmuch-search-line-faces is used to set background color in search\r
+> results, the highlight of the current line is not always displayed\r
+> correctly. This patch fixes that by increasing the priority property of\r
+> the highlight overlay.\r
+> ---\r
+\r
+How about changing `notmuch-search-color-line' to use text properties\r
+instead of overlays?  Then hl-line overlay would take priority over it\r
+without these changes.\r
+\r
+See [1] by David Edmondson on why text properties are better in\r
+general.  I plan to use text properties here to simplify updating the\r
+face when tags are changed.\r
+\r
+Regards,\r
+  Dmitry\r
+\r
+[1] id:"1328604377-20121-2-git-send-email-dme@dme.org"\r
+\r
+>  emacs/notmuch.el |   15 +++++++++++----\r
+>  1 files changed, 11 insertions(+), 4 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+> index 5b4f1c5..f851c6f 100644\r
+> --- a/emacs/notmuch.el\r
+> +++ b/emacs/notmuch.el\r
+> @@ -249,10 +249,17 @@ For a mouse binding, return nil."\r
+>        (set-buffer-modified-p nil)\r
+>        (view-buffer (current-buffer) 'kill-buffer-if-not-modified))))\r
+>  \r
+> -(defcustom notmuch-search-hook '(hl-line-mode)\r
+> +(require 'hl-line)\r
+> +\r
+> +(defun notmuch-hl-line-mode ()\r
+> +  (prog1 (hl-line-mode)\r
+> +    (when hl-line-overlay\r
+> +      (overlay-put hl-line-overlay 'priority 1))))\r
+> +\r
+> +(defcustom notmuch-search-hook '(notmuch-hl-line-mode)\r
+>    "List of functions to call when notmuch displays the search results."\r
+>    :type 'hook\r
+> -  :options '(hl-line-mode)\r
+> +  :options '(notmuch-hl-line-mode)\r
+>    :group 'notmuch-search\r
+>    :group 'notmuch-hooks)\r
+>  \r
+> @@ -567,7 +574,7 @@ a list of strings of the form \"+TAG\" or \"-TAG\".\r
+>  the messages that are about to be tagged"\r
+>  \r
+>    :type 'hook\r
+> -  :options '(hl-line-mode)\r
+> +  :options '(notmuch-hl-line-mode)\r
+>    :group 'notmuch-hooks)\r
+>  \r
+>  (defcustom notmuch-after-tag-hook nil\r
+> @@ -578,7 +585,7 @@ a list of strings of the form \"+TAG\" or \"-TAG\".\r
+>  'query' will be a string containing the search query that determines\r
+>  the messages that were tagged"\r
+>    :type 'hook\r
+> -  :options '(hl-line-mode)\r
+> +  :options '(notmuch-hl-line-mode)\r
+>    :group 'notmuch-hooks)\r
+>  \r
+>  (defun notmuch-search-set-tags (tags)\r
+> -- \r
+> 1.7.7.3\r
+> \r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r