updated for version 7.4.549

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

diff --git a/src/eval.c b/src/eval.c
index 5c584dead59fa0424f54107ed4d497c80e308d43..fbe824eec10e8056f2362648699a6643dbc5e5e1 100644 (file)
--- 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) == '(')
                {
-                   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 9ce35785887ad6fbacacea4968c7ecd9efe1d4a6..c8becc7a7d73c93a71a8438ba3c7932e7b7c7619 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/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

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index b1b5b19dbdaf4f42c409b8a12da623541fb23b63..57f85ea67b448940ae84b5457892e87c5ad073c4 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/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 \

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 28a3640c56a740c19ec734a6c35e2adc2706af88..5718d46018f1a6f40a52599d5c2ecef417e657aa 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/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 \

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index a01dedf83427ddc03481378cd9eb6566d4dccfa4..1ba2dfe9465212a5e58f224cac63f92702a714cd 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/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 \

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 8eecd51a2a258776a982752e76ae1d978253472b..9fecf9fa63cc4cf08b215002f6d065cc7af3a51e 100644 (file)
--- 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  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 \

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 8f9e33c6eed8cd1bc4d9ebf517a1ebf1553cc8fe..e76a72b009222288d1c2a379e65640305e7e995e 100644 (file)
--- a/src/testdir/Makefile
+++ b/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 \

diff --git a/src/version.c b/src/version.c
index 05a9875534b5b8e2dfa757c9a8d291b222c915c4..1c6bbbda66bac8de75a916dcd0f55c8cfb436a8e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    549,
 /**/
     548,
 /**/