From 898f01dee1bf50b0a219807ae2b28f2c5c5aece7 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Wed, 24 Dec 2014 14:35:56 +0100
Subject: vim-patch:7.4.549

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

https://code.google.com/p/vim/source/detail?r=v7-4-549
---
 src/nvim/eval.c    | 13 ++++++-------
 src/nvim/version.c |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 116944b28d..69f2f38a1a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -17580,15 +17580,14 @@ void ex_function(exarg_T *eap)
 
       /* Check for defining a function inside this function. */
       if (checkforcmd(&p, "function", 2)) {
-        if (*p == '!')
+        if (*p == '!') {
           p = skipwhite(p + 1);
+        }
         p += eval_fname_script(p);
-        if (ASCII_ISALPHA(*p)) {
-          free(trans_function_name(&p, TRUE, 0, NULL));
-          if (*skipwhite(p) == '(') {
-            ++nesting;
-            indent += 2;
-          }
+        free(trans_function_name(&p, TRUE, 0, NULL));
+        if (*skipwhite(p) == '(') {
+          nesting++;
+          indent += 2;
         }
       }
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 8a0ab1c7e3..454afcb55d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -189,7 +189,7 @@ static int included_patches[] = {
   //552,
   //551,
   //550,
-  //549,
+  549,
   //548 NA
   547,
   //546,
-- 
cgit