Merge pull request #2 from kamichidu/develop

Support lambda symbol.

Author: mattn

syntax/java.vim

@@ -1,9 +1,10 @@
 " Vim syntax file
 " Language:	Java
-" Maintainer:	Claudio Fleiner <[email protected]>
-" URL:		http://www.fleiner.com/vim/syntax/java.vim
-" Last Change:	2012 Oct 05
-
+" Current Maintainer:	kamichidu <[email protected]>
+" Current URL:		http://github.com/vim-jp/vim-java/
+" Previous Maintainer:	Claudio Fleiner <[email protected]>
+" Previous URL:		http://www.fleiner.com/vim/syntax/java.vim
+" Last Change:	2015 Feb 28
 " Please check :help java.vim for comments on some of the options available.
 
 " Quit when a syntax file was already loaded
@@ -30,7 +31,7 @@ endif
 
 " some characters that cannot be in a java program (outside a string)
 syn match javaError "[\\@`]"
-syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|[^-]->\|\*\/"
+syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
 
 syn match javaOK "\.\.\."
 
@@ -108,8 +109,8 @@ if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("ja
   syn cluster javaTop add=javaLangObject
 endif
 
-if filereadable(expand("<sfile>:p:h")."/javaid.vim")
-  source <sfile>:p:h/javaid.vim
+if globpath(&runtimepath, 'syntax/javaid.vim') !=# ''
+  source syntax/javaid.vim
 endif
 
 if exists("java_space_errors")
@@ -153,10 +154,10 @@ JavaHiLink javaCommentCharacter javaCharacter
 
 syn cluster javaTop add=javaComment,javaLineComment
 
-if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
+if !exists("java_ignore_javadoc") && main_syntax != 'jsp' && globpath(&runtimepath, 'syntax/html.vim') !=# ''
   syntax case ignore
   " syntax coloring for javadoc comments (HTML)
-  syntax include @javaHtml <sfile>:p:h/html.vim
+  syntax include @javaHtml syntax/html.vim
   unlet b:current_syntax
   " HTML enables spell checking for all text that is not in a syntax item. This
   " is wrong for Java (all identifiers would be spell-checked), so it's undone