Merge remote-tracking branch 'origin/master' into run-vint-on-travis

Author: tyru

autoload/vimlparser.vim

@@ -1339,7 +1339,7 @@ function! s:VimLParser.parse_cmd_function() abort
   if left.type ==# s:NODE_IDENTIFIER
     let s = left.value
     let ss = split(s, '\zs')
-    if ss[0] !=# '<' && !s:isupper(ss[0]) && stridx(s, ':') ==# -1 && stridx(s, '#') ==# -1
+    if ss[0] !=# '<' && ss[0] !=# '_' && !s:isupper(ss[0]) && stridx(s, ':') ==# -1 && stridx(s, '#') ==# -1
       throw s:Err(printf('E128: Function name must start with a capital or contain a colon: %s', s), left.pos)
     endif
   endif

js/vimlparser.js

@@ -1622,7 +1622,7 @@ VimLParser.prototype.parse_cmd_function = function() {
     if (left.type == NODE_IDENTIFIER) {
         var s = left.value;
         var ss = viml_split(s, "\\zs");
-        if (ss[0] != "<" && !isupper(ss[0]) && viml_stridx(s, ":") == -1 && viml_stridx(s, "#") == -1) {
+        if (ss[0] != "<" && ss[0] != "_" && !isupper(ss[0]) && viml_stridx(s, ":") == -1 && viml_stridx(s, "#") == -1) {
             throw Err(viml_printf("E128: Function name must start with a capital or contain a colon: %s", s), left.pos);
         }
     }

py/vimlparser.py

@@ -1338,7 +1338,7 @@ def parse_cmd_function(self):
         if left.type == NODE_IDENTIFIER:
             s = left.value
             ss = viml_split(s, "\\zs")
-            if ss[0] != "<" and not isupper(ss[0]) and viml_stridx(s, ":") == -1 and viml_stridx(s, "#") == -1:
+            if ss[0] != "<" and ss[0] != "_" and not isupper(ss[0]) and viml_stridx(s, ":") == -1 and viml_stridx(s, "#") == -1:
                 raise VimLParserException(Err(viml_printf("E128: Function name must start with a capital or contain a colon: %s", s), left.pos))
         # :function {name}
         if self.reader.peekn(1) != "(":

test/test_funcname.ok

@@ -0,0 +1,3 @@
+(function (_F))
+(function (s:SID))
+(function (<SID>SID))

test/test_funcname.vim

@@ -0,0 +1,8 @@
+function _F()
+endfunction
+
+function s:SID()
+endfunction
+
+function <SID>SID()
+endfunction