Remove EXPAND_SKIP_PROCESS, which did not actually work

1 files changed, 3 insertions, 10 deletions

diff --git a/expand.cpp b/expand.cpp
index dca54f70..0eb6a72f 100644
--- a/expand.cpp
+++ b/expand.cpp
@@ -1843,7 +1843,6 @@ int expand_string(const wcstring &input, std::vector<completion_t> &output, expa
         if (!(EXPAND_SKIP_HOME_DIRECTORIES & flags))
             expand_home_directory(next);
 
-
         if (flags & ACCEPT_INCOMPLETE)
         {
             if (! next.empty() && next.at(0) == PROCESS_EXPAND)
@@ -1853,10 +1852,7 @@ int expand_string(const wcstring &input, std::vector<completion_t> &output, expa
                  interested in other completions, so we
                  short-circuit and return
                  */
-                if (!(flags & EXPAND_SKIP_PROCESS))
-                {
-                    expand_pid(next, flags, output, NULL);
-                }
+                expand_pid(next, flags, output, NULL);
                 return EXPAND_OK;
             }
             else
@@ -1864,12 +1860,9 @@ int expand_string(const wcstring &input, std::vector<completion_t> &output, expa
                 append_completion(*out, next);
             }
         }
-        else
+        else if (! expand_pid(next, flags, *out, errors))
         {
-            if (!(flags & EXPAND_SKIP_PROCESS) && ! expand_pid(next, flags, *out, errors))
-            {
-                return EXPAND_ERROR;
-            }
+            return EXPAND_ERROR;
         }
     }