1 files changed, 9 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 6b6d25ac3e..187a7014b2 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13715,7 +13715,7 @@ static void f_sha256(typval_T *argvars, typval_T *rettv)
 static void f_shellescape(typval_T *argvars, typval_T *rettv)
 {
   rettv->vval.v_string = vim_strsave_shellescape(
-      get_tv_string(&argvars[0]), non_zero_arg(&argvars[1]));
+    get_tv_string(&argvars[0]), non_zero_arg(&argvars[1]), true);
   rettv->v_type = VAR_STRING;
 }
 
@@ -19645,6 +19645,14 @@ repeat:
     }
   }
 
+  if (src[*usedlen] == ':' && src[*usedlen + 1] == 'S') {
+    p = vim_strsave_shellescape(*fnamep, false, false);
+    vim_free(*bufp);
+    *bufp = *fnamep = p;
+    *fnamelen = (int)STRLEN(p);
+    *usedlen += 2;
+  }
+
   return valid;
 }