summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/eval.c11
-rw-r--r--src/testdir/Make_amiga.mak3
-rw-r--r--src/testdir/Make_dos.mak1
-rw-r--r--src/testdir/Make_ming.mak1
-rw-r--r--src/testdir/Make_os2.mak1
-rw-r--r--src/testdir/Make_vms.mms3
-rw-r--r--src/testdir/Makefile1
-rw-r--r--src/version.c2
8 files changed, 15 insertions, 8 deletions
diff --git a/src/eval.c b/src/eval.c
index 5c584dead..fbe824eec 100644
--- 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 9ce357858..c8becc7a7 100644
--- 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 b1b5b19db..57f85ea67 100644
--- 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 28a3640c5..5718d4601 100644
--- 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 a01dedf83..1ba2dfe94 100644
--- 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 8eecd51a2..9fecf9fa6 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 @@ 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 8f9e33c6e..e76a72b00 100644
--- 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 05a987553..1c6bbbda6 100644
--- 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,