Mercurial > vim

changeset 6438:1fd9f1d43660 v7.4.549

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.549 Problem: Function name not recognized correctly when inside a function. Solution: Don't check for an alpha character.
author Bram Moolenaar <bram@vim.org>
date Sat, 13 Dec 2014 21:00:55 +0100
parents 520b9b2df2d8
children 242e5cda6696
files src/eval.c src/testdir/Make_amiga.mak src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/testdir/Make_os2.mak src/testdir/Make_vms.mms src/testdir/Makefile src/version.c
diffstat 8 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -22283,14 +22283,11 @@ ex_function(eap)
 		if (*p == '!')
 		    p = skipwhite(p + 1);
 		p += eval_fname_script(p);
-		if (ASCII_ISALPHA(*p))
-		{
-		    vim_free(trans_function_name(&p, TRUE, 0, NULL));
-		    if (*skipwhite(p) == '(')
-		    {
-			++nesting;
-			indent += 2;
-		    }
+		vim_free(trans_function_name(&p, TRUE, 0, NULL));
+		if (*skipwhite(p) == '(')
+		{
+		    ++nesting;
+		    indent += 2;
 		}
 	    }
 
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -47,6 +47,7 @@ SCRIPTS = test1.out test3.out test4.out 
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
@@ -184,6 +185,8 @@ test_eval.out: test_eval.in
 test_insertcount.out: test_insertcount.in
 test_listlbr.out: test_listlbr.in
 test_listlbr_utf8.out: test_listlbr_utf8.in
+test_mapping.out: test_mapping.in
+test_nested_function.out: test_nested_function.in
 test_options.out: test_options.in
 test_qf_title.out: test_qf_title.in
 test_signs.out: test_signs.in
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -46,6 +46,7 @@ SCRIPTS =	test3.out test4.out test5.out 
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -68,6 +68,7 @@ SCRIPTS =	test3.out test4.out test5.out 
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -48,6 +48,7 @@ SCRIPTS = test1.out test3.out test4.out 
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
 # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
 #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
 #
-# Last change:  2014 Dec 08
+# Last change:  2014 Dec 13
 #
 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
 # Edit the lines in the Configuration section below to select.
@@ -107,6 +107,7 @@ SCRIPT = test1.out  test2.out  test3.out
 	 test_listlbr.out \
 	 test_listlbr_utf8.out \
 	 test_mapping.out \
+	 test_nested_function.out \
 	 test_options.out \
 	 test_qf_title.out \
 	 test_signs.out \
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -44,6 +44,7 @@ SCRIPTS = test1.out test2.out test3.out 
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    549,
+/**/
     548,
 /**/
     547,