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 for extra newline that gets appended if a command is not found in

Browse source 
the new parser
This commit is contained in:
ridiculousfish 2014-03-15 13:07:19 -07:00
parent 44e94b8cfa
commit 20f9dd9a6b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
parser.cpp
View file

@ -3032,17 +3032,18 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
if (filename) if (filename)
{ {
prefix = format_string(_(L"%ls (line %lu): "), user_presentable_path(filename).c_str(), which_line); prefix = format_string(_(L"%ls (line %lu): "), user_presentable_path(filename).c_str(), which_line);
//append_format(*output, _(L"%ls (line %lu):\n"), user_presentable_path(filename).c_str(), which_line);
} }
else else
{ {
prefix = L"fish: "; prefix = L"fish: ";
//output->append(L"fish: ");
} }
output->append(err.describe_with_prefix(src, prefix, skip_caret)); const wcstring description = err.describe_with_prefix(src, prefix, skip_caret);
output->push_back(L'\n'); if (! description.empty())
{
output->append(description);
output->push_back(L'\n');
}
this->stack_trace(0, *output); this->stack_trace(0, *output);
} }
} }