summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-03-06 14:51:22 +0000
committerBram Moolenaar <Bram@vim.org>2022-03-06 14:51:22 +0000
commitd523c7be5cf39174f3447e8ec498051cea381d27 (patch)
tree3991b0032ddf82d0b4325314aaf4a754a777b30d
parent655b734ee858e90dd8d28549b7704a71b25d30e7 (diff)
downloadvim-git-d523c7be5cf39174f3447e8ec498051cea381d27.tar.gz
patch 8.2.4519: Vim9: Can still use ":fini" and ":finis" for ":finish"v8.2.4519
Problem: Vim9: Can still use ":fini" and ":finis" for ":finish". Solution: Require using ":finish".
-rw-r--r--src/ex_cmds.h2
-rw-r--r--src/testdir/test_vim9_script.vim2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index cf4bfdccf..a13de4d80 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -630,7 +630,7 @@ EXCMD(CMD_finally, "finally", ex_finally,
EX_TRLBAR|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK|EX_WHOLE,
ADDR_NONE),
EXCMD(CMD_finish, "finish", ex_finish,
- EX_TRLBAR|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
+ EX_TRLBAR|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK|EX_WHOLE,
ADDR_NONE),
EXCMD(CMD_first, "first", ex_rewind,
EX_EXTRA|EX_BANG|EX_CMDARG|EX_ARGOPT|EX_TRLBAR,
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index fb4b79e8f..46a25396d 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -3400,6 +3400,8 @@ def Test_minimal_command_name_length()
'expor',
'fina',
'finall',
+ 'fini',
+ 'finis',
'imp',
'impo',
'impor',
diff --git a/src/version.c b/src/version.c
index 771530ada..800b8fc55 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4519,
+/**/
4518,
/**/
4517,