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

Disable process expansion in autosuggestions

Browse Source 
Addresses https://github.com/fish-shell/fish-shell/issues/39
This commit is contained in:
ridiculousfish
2012-06-29 16:40:54 -07:00
parent 05c721bebb
commit 40e4f49dbe
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
expand.cpp
View File

@@ -379,7 +379,7 @@ static int find_process( const wchar_t *proc,
{
{
wcstring result = format_string(L"%ld", (long)j->pgid);
wcstring result = to_string((long)j->pgid);
out.push_back(completion_t(result));
found = 1;
}
@@ -409,7 +409,7 @@ static int find_process( const wchar_t *proc,
}
else
{
wcstring result = format_string(L"%ld", (long)j->pgid);
wcstring result = to_string((long)j->pgid);
out.push_back(completion_t(result));
found = 1;
}
@@ -1502,7 +1502,8 @@ int expand_string( const wcstring &input, std::vector<completion_t> &output, exp
interested in other completions, so we
short-circut and return
*/
expand_pid( next, flags, output );
if (! (flags & EXPAND_SKIP_PROCESS ))
expand_pid( next, flags, output );
return EXPAND_OK;
}
else
@@ -1512,7 +1513,7 @@ int expand_string( const wcstring &input, std::vector<completion_t> &output, exp
}
else
{
if( !expand_pid( next, flags, *out ) )
if( ! (flags & EXPAND_SKIP_PROCESS ) && ! expand_pid( next, flags, *out ) )
{
return EXPAND_ERROR;
}