From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 9 Dec 2021 16:40:18 +0000 (+0000)
Subject: patch 8.2.3766: converting a funcref to a string leaves out "g:"
X-Git-Tag: v8.2.3766
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4ec338fb80ebfb5d631f0718fdd1a1c04d9ed82;p=vim

patch 8.2.3766: converting a funcref to a string leaves out "g:"

Problem:    Converting a funcref to a string leaves out "g:", causing the
            meaning of the name depending on the context.
Solution:   Prepend "g:" for a global function.
---

diff --git a/src/eval.c b/src/eval.c
index bc4db2906..1e2e4c476 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5006,7 +5006,15 @@ echo_string_core(
 		ga_concat(&ga, (char_u *)"function(");
 		if (fname != NULL)
 		{
-		    ga_concat(&ga, fname);
+		    // When using uf_name prepend "g:" for a global function.
+		    if (pt->pt_name == NULL && fname[0] == '\''
+						      && vim_isupper(fname[1]))
+		    {
+			ga_concat(&ga, (char_u *)"'g:");
+			ga_concat(&ga, fname + 1);
+		    }
+		    else
+			ga_concat(&ga, fname);
 		    vim_free(fname);
 		}
 		if (pt != NULL && pt->pt_argc > 0)
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index ac9bb4cfa..a21566796 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -2771,5 +2771,10 @@ func Test_builtin_check()
   call assert_fails('call extend(g:, #{bar: { -> "foo" }}, "force")', 'E704:')
 endfunc
 
+func Test_funcref_to_string()
+  let Fn = funcref('g:Test_funcref_to_string')
+  call assert_equal("function('g:Test_funcref_to_string')", string(Fn))
+endfunc
+
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 083c111f0..0199acade 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3766,
 /**/
     3765,
 /**/