From 5a7a8003a08852e70cb946b17c2d8f44fdd06139 Mon Sep 17 00:00:00 2001
From: axel <axel@liljencrantz.se>
Date: Sun, 22 Oct 2006 19:40:18 +1000
Subject: [PATCH] Give search highligting precedence over other highligting
 types

darcs-hash:20061022094018-ac50b-0f688dc7e756f428c05e6977db6dc9cf9f642475.gz
---
 reader.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/reader.c b/reader.c
index 621a9158b..0be2bd239 100644
--- a/reader.c
+++ b/reader.c
@@ -1822,7 +1822,8 @@ void reader_set_test_function( int (*f)( wchar_t * ) )
 /**
    Call specified external highlighting function and then do search
    highlighting. Lastly, clear the background color under the cursor
-   to avoid confusion.
+   to avoid repaint issues on terminals where e.g. syntax highligthing
+   maykes characters under the sursor unreadable.
 
    \param match_highlight_pos the position to use for bracket matching. This need not be the same as the surrent cursor position
    \param error if non-null, any possible errors in the buffer are further descibed by the strings inserted into the specified arraylist
@@ -1843,13 +1844,7 @@ static void reader_super_highlight_me_plenty( int match_highlight_pos, array_lis
 
 			for( i=0; i<count; i++ )
 			{
-				/*
-				  Do not overwrite previous highlighting color
-				*/
-				if( data->color[start+i]>>8 == 0 )
-				{
-					data->color[start+i] |= HIGHLIGHT_SEARCH_MATCH<<16;
-				}
+				data->color[start+i] |= HIGHLIGHT_SEARCH_MATCH<<16;
 			}
 		}
 	}