Updated vimrc

sources_non_forked/vim-snipmate/autoload/snipMate.vim

@@ -410,10 +410,10 @@ function! snipMate#OpenSnippetFiles() abort
 	let exists = []
 	let notexists = []
 	for scope in s:AddScopeAliases(snipMate#ScopesByFile())
-		let files += split(s:snippet_filenames(scope, ''))
+		let files += s:snippet_filenames(scope, '')
 	endfor
 	call filter(files, "v:val !~# '\\*'")
-	for path in split(g:snipMate.snippet_dirs, ',')
+	for path in g:snipMate.snippet_dirs
 		let fullpaths = map(copy(files), 'printf("%s/%s", path, v:val)')
 		let exists += filter(copy(fullpaths), 'filereadable(v:val)')
 		let notexists += map(filter(copy(fullpaths),

sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim

@@ -25,7 +25,8 @@ function! snipmate#legacy#process_snippet(snip) abort
 		let isexp = 0
 		for i in snip
 			if isexp
-				call add(new, substitute(eval(i), "\n\\%$", '', ''))
+				call add(new, substitute(snipmate#util#eval(i),
+                                            \ "\n\\%$", '', ''))
 			else
 				call add(new, i)
 			endif
@@ -86,9 +87,9 @@ function! snipmate#legacy#build_stops(snip, lnum, col, indent) abort
 
 		let stops[i] = {}
 		let stops[i].line = a:lnum + s:count(beforeTabStop, "\n")
-		let stops[i].col = a:indent + len(matchstr(withoutOthers, '.*\(\n\|^\)\zs.*\ze'.s:sigil .'{'.i.'\D'))
-                let stops[i].placeholder = 0
-                let stops[i].mirrors = []
+		let stops[i].col = a:indent + len(matchstr(withoutOthers, '\_^.*\ze'.s:sigil .'{'.i.'\D'))
+		let stops[i].placeholder = 0
+		let stops[i].mirrors = []
 		if stops[i].line == a:lnum
 			let stops[i].col += a:col
 		endif

sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim

@@ -99,9 +99,8 @@ endfunction
 
 function! s:parser_expr() dict abort
     let str = join(self.text('`', 1))
-    let ret = eval(str)
     call self.same('`')
-    return type(ret) == type('') ? ret : string(ret)
+    return snipmate#util#eval(str)
 endfunction
 
 function! s:parser_text(...) dict abort

sources_non_forked/vim-snipmate/autoload/snipmate/util.vim

@@ -8,3 +8,15 @@ function! snipmate#util#add_methods(sfile, namespace, methods) abort
 	endfor
 	return dict
 endfunction
+
+function! snipmate#util#eval(arg)
+    try
+        let ret = eval(a:arg)
+    catch
+        echohl ErrorMsg
+        echom 'SnipMate:Expression: ' . v:exception
+        echohl None
+        let ret = ''
+    endtry
+    return type(ret) == type('') ? ret : string(ret)
+endfunction