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

Add fish_new_pager variable to enable new pager on request, disabled by default.

Browse source
This commit is contained in:
ridiculousfish 2014-01-24 17:51:28 -08:00
parent 4c5c1fc9ef
commit 0fbddb0df1
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
parser.cpp
View file

@ -3122,3 +3122,16 @@ 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 0;
}
else
{
return from_string<bool>(var);
}
}

1
parser.h
View file

@ -547,6 +547,7 @@ public:
/* Temporary */
bool parser_use_ast(void);
bool pager_use_inline(void);
#endif

5
reader.cpp
View file

@ -1876,8 +1876,9 @@ static bool handle_completions(const std::vector<completion_t> &comp)
parse_util_get_parameter_info(data->command_line, data->buff_pos, &quote, NULL, NULL);
bool is_quoted = (quote != L'\0');
if (1)
if (pager_use_inline())
{
/* Inline pager */
data->pager.set_prefix(prefix);
data->pager.set_completions(surviving_completions);
@ -1886,7 +1887,7 @@ static bool handle_completions(const std::vector<completion_t> &comp)
}
else
{
/* Clear the autosuggestion from the old commandline before abandoning it (see #561) */
/* Classic pager. Clear the autosuggestion from the old commandline before abandoning it (see #561) */
if (! data->autosuggestion.empty())
reader_repaint_without_autosuggestion();