updated for version 7.4.549

Problem:    Function name not recognized correctly when inside a function.
Solution:   Don't check for an alpha character.

src/eval.c

@@ -22283,8 +22283,6 @@ 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) == '(')
 		{
@@ -22292,7 +22290,6 @@ ex_function(eap)
 		    indent += 2;
 		}
 	    }
-	    }
 
 	    /* Check for ":append" or ":insert". */
 	    p = skip_range(p, NULL);

src/testdir/Make_amiga.mak

@@ -47,6 +47,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.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

src/testdir/Make_dos.mak

@@ -46,6 +46,7 @@ SCRIPTS =	test3.out test4.out test5.out test6.out test7.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 \

src/testdir/Make_ming.mak

@@ -68,6 +68,7 @@ SCRIPTS =	test3.out test4.out test5.out test6.out test7.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 \

src/testdir/Make_os2.mak

@@ -48,6 +48,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.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 \

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  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 \

src/testdir/Makefile

@@ -44,6 +44,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.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 \

src/version.c

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