thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3158: strange error message when using islocked() with a number

Browse Source 
Problem:    Strange error message when using islocked() with a number.
            (Yegappan Lakshmanan)
Solution:   Check that the name is empty.
This commit is contained in:
Bram Moolenaar
2021-07-13 20:32:29 +02:00
parent 16e26a3116
commit 1840a7b4e3
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/evalfunc.c
View File

@@ -5961,7 +5961,10 @@ f_islocked(typval_T *argvars, typval_T *rettv)
if (end != NULL && lv.ll_name != NULL) if (end != NULL && lv.ll_name != NULL)
{ {
if (*end != NUL) if (*end != NUL)
semsg(_(e_trailing_arg), end); {
semsg(_(lv.ll_name == lv.ll_name_end
? e_invarg2 : e_trailing_arg), end);
}
else else
{ {
if (lv.ll_tv == NULL) if (lv.ll_tv == NULL)

5
src/testdir/test_functions.vim
View File

@@ -95,6 +95,11 @@ func Test_test_void()
call assert_fails('let x = copy([test_void()])', 'E1031:') call assert_fails('let x = copy([test_void()])', 'E1031:')
endfunc endfunc
func Test_islocked()
call assert_fails('call islocked(99)', 'E475:')
call assert_fails('call islocked("s: x")', 'E488:')
endfunc
func Test_len() func Test_len()
call assert_equal(1, len(0)) call assert_equal(1, len(0))
call assert_equal(2, len(12)) call assert_equal(2, len(12))

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3158,
/**/ /**/
3157, 3157,
/**/ /**/