# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1626201903 -7200
# Node ID 11ed1f0adb019e771366bab276ba17704d5bf879
# Parent  1cbecb36d0d5e977e970e3ac40d6e65715631d83
patch 8.2.3158: strange error message when using islocked() with a number

Commit: https://github.com/vim/vim/commit/1840a7b4e3577e617f724c9d07ccc78195cc010a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jul 13 20:32:29 2021 +0200

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

    Problem:    Strange error message when using islocked() with a number.
                (Yegappan Lakshmanan)
    Solution:   Check that the name is empty.

diff --git a/src/evalfunc.c b/src/evalfunc.c
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5961,7 +5961,10 @@ f_islocked(typval_T *argvars, typval_T *
     if (end != NULL && lv.ll_name != NULL)
     {
 	if (*end != NUL)
-	    semsg(_(e_trailing_arg), end);
+	{
+	    semsg(_(lv.ll_name == lv.ll_name_end
+					   ? e_invarg2 : e_trailing_arg), end);
+	}
 	else
 	{
 	    if (lv.ll_tv == NULL)
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -95,6 +95,11 @@ func Test_test_void()
   call assert_fails('let x = copy([test_void()])', 'E1031:')
 endfunc
 
+func Test_islocked()
+  call assert_fails('call islocked(99)', 'E475:')
+  call assert_fails('call islocked("s: x")', 'E488:')
+endfunc
+
 func Test_len()
   call assert_equal(1, len(0))
   call assert_equal(2, len(12))
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3158,
+/**/
     3157,
 /**/
     3156,