Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove confusing and misleading error message when trying to repaint the prompt during startup, reported by Chris Rebert.

Browse source 
darcs-hash:20070801180901-ac50b-43abf47182fcaa19fdbd993d480ac07f2915b6ed.gz
This commit is contained in:
axel 2007-08-02 04:09:01 +10:00
parent cd19320ab2
commit 782a739736
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
builtin_commandline.c
View file

@ -235,13 +235,23 @@ static int builtin_commandline( wchar_t **argv )
if( !get_buffer() ) if( !get_buffer() )
{ {
if (is_interactive_session)
{
/*
Prompt change requested while we don't have
a prompt, most probably while reading the
init files. Just ignore it.
*/
return 1;
}
sb_append2( sb_err, sb_append2( sb_err,
argv[0], argv[0],
L": Can not set commandline in non-interactive mode\n", L": Can not set commandline in non-interactive mode\n",
(void *)0 ); (void *)0 );
builtin_print_help( argv[0], sb_err ); builtin_print_help( argv[0], sb_err );
return 1; return 1;
} }
woptind=0; woptind=0;

6
share/config_interactive.fish.in
View file

@ -165,8 +165,10 @@ functions -e set_default
# #
function __fish_repaint --on-variable fish_color_cwd --description "Event handler, repaints the prompt when fish_color_cwd changes" function __fish_repaint --on-variable fish_color_cwd --description "Event handler, repaints the prompt when fish_color_cwd changes"
set -e __fish_prompt_cwd if status --is-interactive
commandline -f repaint set -e __fish_prompt_cwd
commandline -f repaint ^/dev/null
end
end end
# #