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

Fix to output the prompt even if fish_prompt fails

Browse source
This commit is contained in:
ridiculousfish 2013-01-27 13:44:32 -08:00
parent 27e71c5f37
commit 0257b02a8c
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reader.cpp
View file

@ -723,29 +723,25 @@ static void exec_prompt()
{ {
proc_push_interactive(0); proc_push_interactive(0);
if (data->left_prompt.size()) if (! data->left_prompt.empty())
{ {
wcstring_list_t prompt_list; wcstring_list_t prompt_list;
if (exec_subshell(data->left_prompt, prompt_list) == 0) exec_subshell(data->left_prompt, prompt_list);
for (size_t i = 0; i < prompt_list.size(); i++)
{ {
for (size_t i = 0; i < prompt_list.size(); i++) if (i > 0) data->left_prompt_buff += L'\n';
{ data->left_prompt_buff += prompt_list.at(i);
if (i > 0) data->left_prompt_buff += L'\n';
data->left_prompt_buff += prompt_list.at(i);
}
} }
} }
if (data->right_prompt.size()) if (! data->right_prompt.empty())
{ {
wcstring_list_t prompt_list; wcstring_list_t prompt_list;
if (exec_subshell(data->right_prompt, prompt_list) == 0) exec_subshell(data->right_prompt, prompt_list);
for (size_t i = 0; i < prompt_list.size(); i++)
{ {
for (size_t i = 0; i < prompt_list.size(); i++) // Right prompt does not support multiple lines, so just concatenate all of them
{ data->right_prompt_buff += prompt_list.at(i);
// Right prompt does not support multiple lines, so just concatenate all of them
data->right_prompt_buff += prompt_list.at(i);
}
} }
} }