h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-27 00:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into parser_cleanup

Browse Source
This commit is contained in:
ridiculousfish
2014-03-15 20:24:25 -07:00
parent 1fa9167f25 73c2846d64
commit 5c54ef7b0d
32 changed files with 25433 additions and 21676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
parser.cpp
View File

@@ -1392,17 +1392,18 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
if (filename)
{
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
{
prefix = L"fish: ";
//output->append(L"fish: ");
}
output->append(err.describe_with_prefix(src, prefix, skip_caret));
output->push_back(L'\n');
const wcstring description = err.describe_with_prefix(src, prefix, skip_caret);
if (! description.empty())
{
output->append(description);
output->push_back(L'\n');
}
this->stack_trace(0, *output);
}
}
@@ -1488,16 +1489,3 @@ bool parser_use_ast(void)
return from_string<bool>(var);
}
}
bool pager_use_inline(void)
{
env_var_t var = env_get_string(L"fish_new_pager");
if (var.missing_or_empty())
{
return 1;
}
else
{
return from_string<bool>(var);
}
}