Mercurial > vim
changeset 6551:4e31d9f7c896 v7.4.602
updated for version 7.4.602
Problem: ":set" does not accept hex numbers as documented.
Solution: Use vim_str2nr(). (ZyX)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 27 Jan 2015 15:58:40 +0100 |
| parents | 0a62a4203939 |
| children | 3469920cbc44 |
| files | runtime/doc/options.txt src/option.c src/version.c |
| diffstat | 3 files changed, 6 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -59,9 +59,7 @@ 1. Setting options *set-option* *E76 :se[t] {option}:{value} Set string or number option to {value}. For numeric options the value can be given in decimal, - hex (preceded with 0x) or octal (preceded with '0') - (hex and octal are only available for machines which - have the strtol() function). + hex (preceded with 0x) or octal (preceded with '0'). The old value can be inserted by typing 'wildchar' (by default this is a <Tab> or CTRL-E if 'compatible' is set). See |cmdline-completion|.
--- a/src/option.c +++ b/src/option.c @@ -4540,21 +4540,11 @@ do_set(arg, opt_flags) goto skip; } } - /* allow negative numbers (for 'undolevels') */ else if (*arg == '-' || VIM_ISDIGIT(*arg)) { - i = 0; - if (*arg == '-') - i = 1; -#ifdef HAVE_STRTOL - value = strtol((char *)arg, NULL, 0); - if (arg[i] == '0' && TOLOWER_ASC(arg[i + 1]) == 'x') - i += 2; -#else - value = atol((char *)arg); -#endif - while (VIM_ISDIGIT(arg[i])) - ++i; + /* Allow negative (for 'undolevels'), octal and + * hex numbers. */ + vim_str2nr(arg, NULL, &i, TRUE, TRUE, &value, NULL); if (arg[i] != NUL && !vim_iswhite(arg[i])) { errmsg = e_invarg;