Mercurial > vim

comparison src/eval.c @ 6927:58d9f967ae1a v7.4.782

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 7.4.782 Problem: Still a few problems with CTRL-A and CTRL-X in Visual mode. Solution: Fix the reported problems. (Christian Brabandt)
author Bram Moolenaar <bram@vim.org>
date Fri, 17 Jul 2015 13:03:48 +0200
parents 676906c33768
children 4db70c94226b
comparison
equal deleted inserted replaced
6926:b2839b524d9f 6927:58d9f967ae1a
1613 1613
1614 if (str_arg_only) 1614 if (str_arg_only)
1615 len = 0; 1615 len = 0;
1616 else 1616 else
1617 /* Recognize a number argument, the others must be strings. */ 1617 /* Recognize a number argument, the others must be strings. */
1618 vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL); 1618 vim_str2nr(argv[i], NULL, &len, TRUE, TRUE, &n, NULL, 0);
1619 if (len != 0 && len == (int)STRLEN(argv[i])) 1619 if (len != 0 && len == (int)STRLEN(argv[i]))
1620 { 1620 {
1621 argvars[i].v_type = VAR_NUMBER; 1621 argvars[i].v_type = VAR_NUMBER;
1622 argvars[i].vval.v_number = n; 1622 argvars[i].vval.v_number = n;
1623 } 1623 }
5126 } 5126 }
5127 } 5127 }
5128 else 5128 else
5129 #endif 5129 #endif
5130 { 5130 {
5131 vim_str2nr(*arg, NULL, &len, TRUE, TRUE, &n, NULL); 5131 vim_str2nr(*arg, NULL, &len, TRUE, TRUE, &n, NULL, 0);
5132 *arg += len; 5132 *arg += len;
5133 if (evaluate) 5133 if (evaluate)
5134 { 5134 {
5135 rettv->v_type = VAR_NUMBER; 5135 rettv->v_type = VAR_NUMBER;
5136 rettv->vval.v_number = n; 5136 rettv->vval.v_number = n;
18231 } 18231 }
18232 18232
18233 p = skipwhite(get_tv_string(&argvars[0])); 18233 p = skipwhite(get_tv_string(&argvars[0]));
18234 if (*p == '+') 18234 if (*p == '+')
18235 p = skipwhite(p + 1); 18235 p = skipwhite(p + 1);
18236 vim_str2nr(p, NULL, NULL, base == 8 ? 2 : 0, base == 16 ? 2 : 0, &n, NULL); 18236 vim_str2nr(p, NULL, NULL, base == 8 ? 2 : 0, base == 16 ? 2 : 0, &n, NULL, 0);
18237 rettv->vval.v_number = n; 18237 rettv->vval.v_number = n;
18238 } 18238 }
18239 18239
18240 #ifdef HAVE_STRFTIME 18240 #ifdef HAVE_STRFTIME
18241 /* 18241 /*
21037 EMSG(_("E703: Using a Funcref as a Number")); 21037 EMSG(_("E703: Using a Funcref as a Number"));
21038 break; 21038 break;
21039 case VAR_STRING: 21039 case VAR_STRING:
21040 if (varp->vval.v_string != NULL) 21040 if (varp->vval.v_string != NULL)
21041 vim_str2nr(varp->vval.v_string, NULL, NULL, 21041 vim_str2nr(varp->vval.v_string, NULL, NULL,
21042 TRUE, TRUE, &n, NULL); 21042 TRUE, TRUE, &n, NULL, 0);
21043 return n; 21043 return n;
21044 case VAR_LIST: 21044 case VAR_LIST:
21045 EMSG(_("E745: Using a List as a Number")); 21045 EMSG(_("E745: Using a List as a Number"));
21046 break; 21046 break;
21047 case VAR_DICT: 21047 case VAR_DICT: