diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2021-06-03 01:55:18 +0100 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2021-09-11 15:36:03 +0100 |
| commit | 90a4cf92d21b730fea7099fb3e12a9ef791a1a57 (patch) | |
| tree | c342ec4595fd613430bff9e7a6924c7ee3291c71 /src/nvim/eval/funcs.c | |
| parent | 10018958d860780c3766f4e785710201c07f3684 (diff) | |
| download | rneovim-90a4cf92d21b730fea7099fb3e12a9ef791a1a57.tar.gz rneovim-90a4cf92d21b730fea7099fb3e12a9ef791a1a57.tar.bz2 rneovim-90a4cf92d21b730fea7099fb3e12a9ef791a1a57.zip | |
vim-patch:8.2.0886: cannot use octal numbers in scriptversion 4
Problem: Cannot use octal numbers in scriptversion 4.
Solution: Add the "0o" notation. (Ken Takata, closes vim/vim#5304)
https://github.com/vim/vim/commit/c17e66c5c0acd5038f1eb3d7b3049b64bb6ea30b
:scriptversion is N/A.
Cherry-pick latest str2nr() doc changes from v8.1.2035.
Cherry-pick various mentions of the 0o prefix from:
- v8.2.2324
- https://github.com/vim/vim/commit/2346a6378483c9871016f9fc821ec5cbea638f13
- https://github.com/vim/vim/commit/11e3c5ba820325b69cb56f70e13c21d7b8808d33
- https://github.com/vim/vim/commit/82be4849eed0b8fbee45bc8da99b685ec89af59a
Patch used ascii_isbdigit() by mistake, which was fixed in v8.2.2309.
Make STR2NR_OOCT work the same as STR2NR_OCT when forcing.
In Vim, STR2NR_FORCE | STR2NR_OOCT isn't handled, and doesn't actually
force anything. Rather than abort(), make it work as STR2NR_OCT.
This means STR2NR_FORCE | STR2NR_OCT works the same as
STR2NR_FORCE | STR2NR_OOCT and STR2NR_FORCE | STR2NR_OCT | STR2NR_OOCT.
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 61f535e32e..801b0f9d1c 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -10022,7 +10022,7 @@ static void f_str2nr(typval_T *argvars, typval_T *rettv, FunPtr fptr) break; } case 8: { - what |= STR2NR_OCT | STR2NR_FORCE; + what |= STR2NR_OCT | STR2NR_OOCT | STR2NR_FORCE; break; } case 16: { |