Pull from upstream

This commit is contained in:
Julian Aron Prenner 2014-01-15 15:44:27 +01:00
parent 213e907044
commit 9e27ba5109
2 changed files with 2 additions and 7 deletions

View file

@ -28,6 +28,7 @@ enum
highlight_spec_quote, //quoted string
highlight_spec_redirection, //redirection
highlight_spec_autosuggestion, //autosuggestion
highlight_spec_selection,
HIGHLIGHT_SPEC_PRIMARY_MASK = 0xFF,
@ -50,12 +51,6 @@ inline highlight_spec_t highlight_make_background(highlight_spec_t val)
return val << 16;
}
/**
Internal value representing highlighting an active selection
*/
#define HIGHLIGHT_SELECTION 0x80
class history_item_t;
struct file_detection_context_t;

View file

@ -575,7 +575,7 @@ static void reader_repaint()
if(data->sel_active)
{
int selection_color = HIGHLIGHT_SELECTION << 16;
highlight_spec_t selection_color = highlight_make_background(highlight_spec_selection);
for(int i = data->sel_start_pos; i <= std::min(len - 1, data->sel_stop_pos); i++)
{
colors[i] = selection_color;