mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 05:13:10 +00:00
Pull from upstream
This commit is contained in:
parent
213e907044
commit
9e27ba5109
2 changed files with 2 additions and 7 deletions
|
@ -28,6 +28,7 @@ enum
|
||||||
highlight_spec_quote, //quoted string
|
highlight_spec_quote, //quoted string
|
||||||
highlight_spec_redirection, //redirection
|
highlight_spec_redirection, //redirection
|
||||||
highlight_spec_autosuggestion, //autosuggestion
|
highlight_spec_autosuggestion, //autosuggestion
|
||||||
|
highlight_spec_selection,
|
||||||
|
|
||||||
HIGHLIGHT_SPEC_PRIMARY_MASK = 0xFF,
|
HIGHLIGHT_SPEC_PRIMARY_MASK = 0xFF,
|
||||||
|
|
||||||
|
@ -50,12 +51,6 @@ inline highlight_spec_t highlight_make_background(highlight_spec_t val)
|
||||||
return val << 16;
|
return val << 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
Internal value representing highlighting an active selection
|
|
||||||
*/
|
|
||||||
#define HIGHLIGHT_SELECTION 0x80
|
|
||||||
|
|
||||||
class history_item_t;
|
class history_item_t;
|
||||||
struct file_detection_context_t;
|
struct file_detection_context_t;
|
||||||
|
|
||||||
|
|
|
@ -575,7 +575,7 @@ static void reader_repaint()
|
||||||
|
|
||||||
if(data->sel_active)
|
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++)
|
for(int i = data->sel_start_pos; i <= std::min(len - 1, data->sel_stop_pos); i++)
|
||||||
{
|
{
|
||||||
colors[i] = selection_color;
|
colors[i] = selection_color;
|
||||||
|
|
Loading…
Reference in a new issue