From e63c6ca8f2483fc4882585db0168f66860799959 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 13 Jul 2016 16:52:18 +0200
Subject: genvimvim.lua: fix matching functions

Fixes https://github.com/neovim/neovim/issues/5060.
---
 scripts/genvimvim.lua | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/genvimvim.lua b/scripts/genvimvim.lua
index 9135c8e3ab..35e9e8ce00 100644
--- a/scripts/genvimvim.lua
+++ b/scripts/genvimvim.lua
@@ -123,13 +123,12 @@ for line in eval_fd:lines() do
     if line == '};' then
       break
     end
-    local func_name = line:match('^  {"(%w+)",')
-    if func_name then
-      if lld.line_length > 850 then
-        w('\n' .. vimfun_start)
-      end
-      w(' ' .. func_name)
+    local func_name = line:match('^  { "([%w_]+)",')
+    assert(func_name, 'Did not find a function in line: '..line)
+    if lld.line_length > 850 then
+      w('\n' .. vimfun_start)
     end
+    w(' ' .. func_name)
   end
 end
 eval_fd:close()
-- 
cgit 


From 329f922f144c7e37012bc89b619b87b1d0dd3a55 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Thu, 14 Jul 2016 00:42:55 +0200
Subject: fixup! genvimvim.lua: fix matching functions

---
 .ci/common/test.sh    | 10 +++++++++-
 scripts/genvimvim.lua |  9 +++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.ci/common/test.sh b/.ci/common/test.sh
index 225d88e072..02d0b3a645 100644
--- a/.ci/common/test.sh
+++ b/.ci/common/test.sh
@@ -83,8 +83,9 @@ install_nvim() {
     exit 1
   }
 
+  local genvimsynf=syntax/vim/generated.vim
   # Check that all runtime files were installed
-  for file in doc/tags syntax/vim/generated.vim $(
+  for file in doc/tags $genvimsynf $(
     cd runtime ; git ls-files | grep -e '.vim$' -e '.ps$' -e '.dict$' -e '.py$' -e '.tutor$'
   ) ; do
     if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
@@ -93,6 +94,13 @@ install_nvim() {
     fi
   done
 
+  # Check that generated syntax file has function names, #5060.
+  local gpat='syn keyword vimFuncName .*eval'
+  if ! grep -q "$gpat" $genvimsynf ; then
+    echo "It appears that $genvimsynf does not contain $gpat."
+    exit 1
+  fi
+
   for file in $(
     cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$'
   ) ; do
diff --git a/scripts/genvimvim.lua b/scripts/genvimvim.lua
index 35e9e8ce00..2a82181841 100644
--- a/scripts/genvimvim.lua
+++ b/scripts/genvimvim.lua
@@ -124,11 +124,12 @@ for line in eval_fd:lines() do
       break
     end
     local func_name = line:match('^  { "([%w_]+)",')
-    assert(func_name, 'Did not find a function in line: '..line)
-    if lld.line_length > 850 then
-      w('\n' .. vimfun_start)
+    if func_name then
+      if lld.line_length > 850 then
+        w('\n' .. vimfun_start)
+      end
+      w(' ' .. func_name)
     end
-    w(' ' .. func_name)
   end
 end
 eval_fd:close()
-- 
cgit 


From 90d1ad39750d573750f6af79402cba390a30224d Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 19 Jul 2016 12:37:19 +0200
Subject: fixup! fixup! genvimvim.lua: fix matching functions

---
 .ci/common/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/common/test.sh b/.ci/common/test.sh
index 02d0b3a645..1e66ecb239 100644
--- a/.ci/common/test.sh
+++ b/.ci/common/test.sh
@@ -96,7 +96,7 @@ install_nvim() {
 
   # Check that generated syntax file has function names, #5060.
   local gpat='syn keyword vimFuncName .*eval'
-  if ! grep -q "$gpat" $genvimsynf ; then
+  if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf"; then
     echo "It appears that $genvimsynf does not contain $gpat."
     exit 1
   fi
-- 
cgit