Disable process expansion in autosuggestions

Addresses https://github.com/fish-shell/fish-shell/issues/39

1 files changed, 5 insertions, 4 deletions

diff --git a/expand.cpp b/expand.cpp
index 28e2c690..0d4c84cb 100644
--- a/expand.cpp
+++ b/expand.cpp
@@ -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;
             }