diff --git a/src/eval.c b/src/eval.c
index 5c584de..fbe824e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -22283,14 +22283,11 @@
 		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) == '(')
 		{
-		    vim_free(trans_function_name(&p, TRUE, 0, NULL));
-		    if (*skipwhite(p) == '(')
-		    {
-			++nesting;
-			indent += 2;
-		    }
+		    ++nesting;
+		    indent += 2;
 		}
 	    }
 
diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 9ce3578..c8becc7 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -47,6 +47,7 @@
 		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_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
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index b1b5b19..57f85ea 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -46,6 +46,7 @@
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 28a3640..5718d46 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -68,6 +68,7 @@
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index a01dedf..1ba2dfe 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -48,6 +48,7 @@
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 8eecd51..9fecf9f 100644
--- 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 @@
 	 test_listlbr.out \
 	 test_listlbr_utf8.out \
 	 test_mapping.out \
+	 test_nested_function.out \
 	 test_options.out \
 	 test_qf_title.out \
 	 test_signs.out \
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 8f9e33c..e76a72b 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -44,6 +44,7 @@
 		test_listlbr.out \
 		test_listlbr_utf8.out \
 		test_mapping.out \
+		test_nested_function.out \
 		test_options.out \
 		test_qf_title.out \
 		test_signs.out \
diff --git a/src/version.c b/src/version.c
index 05a9875..1c6bbbd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    549,
+/**/
     548,
 /**/
     547,