From a142c5e1ec99278b9ca235bbd71adf693be62373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Smyku=C5=82a?= Date: Tue, 18 Jun 2013 22:20:28 +0200 Subject: [PATCH] Support for defining color with bold/brighter color set --- share/functions/__fish_git_prompt.fish | 15 +++++++++++++-- .../sample_prompts/informative_git.fish | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish index bef8753c6..1b0b187aa 100644 --- a/share/functions/__fish_git_prompt.fish +++ b/share/functions/__fish_git_prompt.fish @@ -493,13 +493,24 @@ end function __fish_git_prompt_set_color set -l user_variable_name "$argv[1]" + set -l user_variable $$user_variable_name + set -l user_variable_bright + + if test (count $user_variable) -eq 2 + set user_variable_bright $user_variable[2] + set user_variable $user_variable[1] + end + set -l variable _$user_variable_name set -l variable_done "$variable"_done - set -l user_variable $$user_variable_name if not set -q $variable if test -n "$user_variable" - set -g $variable (set_color $user_variable) + if test -n "$user_variable_bright" + set -g $variable (set_color -o $user_variable) + else + set -g $variable (set_color $user_variable) + end set -g $variable_done (set_color normal) else set -g $variable '' diff --git a/share/tools/web_config/sample_prompts/informative_git.fish b/share/tools/web_config/sample_prompts/informative_git.fish index b7bf19f3a..f88150736 100644 --- a/share/tools/web_config/sample_prompts/informative_git.fish +++ b/share/tools/web_config/sample_prompts/informative_git.fish @@ -4,7 +4,7 @@ set -g __fish_git_prompt_show_status 1 set -g __fish_git_prompt_hide_untrackedfiles 1 -set -g __fish_git_prompt_color_branch magenta +set -g __fish_git_prompt_color_branch magenta bold set -g __fish_git_prompt_showupstream "informative" set -g __fish_git_prompt_char_upstream_ahead "↑" set -g __fish_git_prompt_char_upstream_behind "↓" @@ -20,7 +20,7 @@ set -g __fish_git_prompt_color_dirtystate blue set -g __fish_git_prompt_color_stagedstate yellow set -g __fish_git_prompt_color_invalidstate red set -g __fish_git_prompt_color_untrackedfiles $fish_color_normal -set -g __fish_git_prompt_color_cleanstate green +set -g __fish_git_prompt_color_cleanstate green bold function fish_prompt --description 'Write out the prompt'