diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-12-30 13:11:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-12-30 13:11:27 +0100 |
| commit | b6b046b281fac168a78b3eafdea9274bef06882f (patch) | |
| tree | 8d50c58421278f30521e290a8cf18c6085b78168 /runtime/syntax/java.vim | |
| parent | deaf7b739791095e2c98a7087dfe9b3c8dfd56f2 (diff) | |
| download | vim-git-b6b046b281fac168a78b3eafdea9274bef06882f.tar.gz | |
Updated runtime files.
Diffstat (limited to 'runtime/syntax/java.vim')
| -rw-r--r-- | runtime/syntax/java.vim | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim index d11afa8b6..13ca62ca4 100644 --- a/runtime/syntax/java.vim +++ b/runtime/syntax/java.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Java " Maintainer: Claudio Fleiner <claudio@fleiner.com> " URL: http://www.fleiner.com/vim/syntax/java.vim -" Last Change: 2010 March 23 +" Last Change: 2011 Dec 30 " Please check :help java.vim for comments on some of the options available. @@ -120,11 +120,8 @@ syn region javaLabelRegion transparent matchgroup=javaLabel start="\<case\>" ma syn match javaUserLabel "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=javaLabel syn keyword javaLabel default -if !exists("java_allow_cpp_keywords") - syn keyword javaError auto delete extern friend inline redeclared - syn keyword javaError register signed sizeof struct template typedef union - syn keyword javaError unsigned operator -endif +" highlighting C++ keywords as errors removed, too many people find it +" annoying. Was: if !exists("java_allow_cpp_keywords") " The following cluster contains all java groups except the contained ones syn cluster javaTop add=javaExternal,javaError,javaError,javaBranch,javaLabelRegion,javaLabel,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaType,javaStatement,javaStorageClass,javaAssert,javaExceptions,javaMethodDecl,javaClassDecl,javaClassDecl,javaClassDecl,javaScopeDecl,javaError,javaError2,javaUserLabel,javaLangObject,javaAnnotation,javaVarArg |