Merge 0c22140 into d9914a0

neovim · Apr 3, 2014 · 193322f · 193322f
2 parents d9914a0 + 0c22140
commit 193322f
Show file tree

Hide file tree

Showing 6 changed files with 357 additions and 16 deletions.
diff --git a/src/misc2.c b/src/misc2.c
@@ -49,6 +49,7 @@
 #include "ui.h"
 #include "window.h"
 #include "os/os.h"
+#include "os/shell.h"
 
 static int coladvance2(pos_T *pos, int addspaces, int finetune,
                        colnr_T wcol);
@@ -1538,7 +1539,7 @@ int call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg)
     tag_freematch();
 
     if (cmd == NULL || *p_sxq == NUL)
-      retval = mch_call_shell(cmd, opts, extra_shell_arg);
+      retval = os_call_shell(cmd, opts, extra_shell_arg);
     else {
       char_u *ecmd = cmd;
 
@@ -1556,7 +1557,7 @@ int call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg)
         STRCAT(ncmd, STRCMP(p_sxq, "(") == 0 ? (char_u *)")"
             : STRCMP(p_sxq, "\"(") == 0 ? (char_u *)")\""
             : p_sxq);
-        retval = mch_call_shell(ncmd, opts, extra_shell_arg);
+        retval = os_call_shell(ncmd, opts, extra_shell_arg);
         vim_free(ncmd);
       } else
         retval = -1;