updated for version 7.3.614

Problem:    Number argument gets turned into a number while it should be a
            string.
Solution:   Add flag to the call_vim_function() call. (Yasuhiro Matsumoto)

diff --git a/src/edit.c b/src/edit.c
index 68b8968581253532943748b2f0c0cee0528ebbed..1c614333ffe724a251cabbd66ab435215e93daa4 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -3959,7 +3959,7 @@ expand_by_function(type, base)
     curbuf_save = curbuf;
 
     /* Call a function, which returns a list or dict. */
-    if (call_vim_function(funcname, 2, args, FALSE, &rettv) == OK)
+    if (call_vim_function(funcname, 2, args, FALSE, FALSE, &rettv) == OK)
     {
        switch (rettv.v_type)
        {

diff --git a/src/eval.c b/src/eval.c
index b83334c361c31305e96bae757ca5964e6bd18f2c..b04f33034ae2cdc73be8e5cc89ef4ac6ddf6638c 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1564,11 +1564,12 @@ eval_expr(arg, nextcmd)
  * Returns OK or FAIL.
  */
     int
-call_vim_function(func, argc, argv, safe, rettv)
+call_vim_function(func, argc, argv, safe, str_arg_only, rettv)
     char_u      *func;
     int                argc;
     char_u      **argv;
     int                safe;           /* use the sandbox */
+    int                str_arg_only;   /* all arguments are strings */
     typval_T   *rettv;
 {
     typval_T   *argvars;
@@ -1593,8 +1594,11 @@ call_vim_function(func, argc, argv, safe, rettv)
            continue;
        }
 
-       /* Recognize a number argument, the others must be strings. */
-       vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL);
+       if (str_arg_only)
+           len = 0;
+       else
+           /* Recognize a number argument, the others must be strings. */
+           vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL);
        if (len != 0 && len == (int)STRLEN(argv[i]))
        {
            argvars[i].v_type = VAR_NUMBER;
@@ -1646,7 +1650,8 @@ call_func_retstr(func, argc, argv, safe)
     typval_T   rettv;
     char_u     *retval;
 
-    if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL)
+    /* All arguments are passed as strings, no conversion to number. */
+    if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL)
        return NULL;
 
     retval = vim_strsave(get_tv_string(&rettv));
@@ -1671,7 +1676,8 @@ call_func_retnr(func, argc, argv, safe)
     typval_T   rettv;
     long       retval;
 
-    if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL)
+    /* All arguments are passed as strings, no conversion to number. */
+    if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL)
        return -1;
 
     retval = get_tv_number_chk(&rettv, NULL);
@@ -1694,7 +1700,8 @@ call_func_retlist(func, argc, argv, safe)
 {
     typval_T   rettv;
 
-    if (call_vim_function(func, argc, argv, safe, &rettv) == FAIL)
+    /* All arguments are passed as strings, no conversion to number. */
+    if (call_vim_function(func, argc, argv, safe, TRUE, &rettv) == FAIL)
        return NULL;
 
     if (rettv.v_type != VAR_LIST)

diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 63c140c5565ff2ccca23123b7ffebcf9bfb5e2bf..a102598559bd5574caab44612601a7fe782ba724 100644 (file)
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -23,7 +23,7 @@ int eval_to_number __ARGS((char_u *expr));
 list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
 int get_spellword __ARGS((list_T *list, char_u **pp));
 typval_T *eval_expr __ARGS((char_u *arg, char_u **nextcmd));
-int call_vim_function __ARGS((char_u *func, int argc, char_u **argv, int safe, typval_T *rettv));
+int call_vim_function __ARGS((char_u *func, int argc, char_u **argv, int safe, int str_arg_only, typval_T *rettv));
 void *call_func_retstr __ARGS((char_u *func, int argc, char_u **argv, int safe));
 long call_func_retnr __ARGS((char_u *func, int argc, char_u **argv, int safe));
 void *call_func_retlist __ARGS((char_u *func, int argc, char_u **argv, int safe));

diff --git a/src/version.c b/src/version.c
index 15da1d8d72d99d3e11de3c96cb1d2f09a271ec31..3a662a2a83fdb48379584321da5af432c1eead7f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    614,
 /**/
     613,
 /**/