Skip to content

Commit 49dd736

Browse files
committed
Avoid error when sourcing other syntaxes.
1 parent c5846f0 commit 49dd736

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

syntax/java.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ if exists("java_highlight_all") || exists("java_highlight_java") || exists("ja
109109
syn cluster javaTop add=javaLangObject
110110
endif
111111

112-
if filereadable(expand("<sfile>:p:h")."/javaid.vim")
113-
source <sfile>:p:h/javaid.vim
112+
if globpath(&runtimepath, 'syntax/javaid.vim') !=# ''
113+
source syntax/javaid.vim
114114
endif
115115

116116
if exists("java_space_errors")
@@ -154,10 +154,10 @@ JavaHiLink javaCommentCharacter javaCharacter
154154

155155
syn cluster javaTop add=javaComment,javaLineComment
156156

157-
if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
157+
if !exists("java_ignore_javadoc") && main_syntax != 'jsp' && globpath(&runtimepath, 'syntax/html.vim') !=# ''
158158
syntax case ignore
159159
" syntax coloring for javadoc comments (HTML)
160-
syntax include @javaHtml <sfile>:p:h/html.vim
160+
syntax include @javaHtml syntax/html.vim
161161
unlet b:current_syntax
162162
" HTML enables spell checking for all text that is not in a syntax item. This
163163
" is wrong for Java (all identifiers would be spell-checked), so it's undone

0 commit comments

Comments
 (0)