Cleanup.

lcd047 · lcd047 · commit 176e32ca4de9 · 2015-06-26T07:01:05.000+03:00
diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.6.0-108'
+let g:_SYNTASTIC_VERSION = '3.6.0-109'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
diff --git a/syntax_checkers/java/javac.vim b/syntax_checkers/java/javac.vim
@@ -73,6 +73,17 @@ endif
 
 " }}}1
 
+" Constants {{{1
+
+let s:_FILE_SHORTCUTS = {
+        \ '%FILE_PATH%':  '%:p',
+        \ '%FILE_NAME%':  '%:t',
+        \ '%FILE_DIR%':   '%:p:h',
+    \ }
+lockvar! s:_FILE_SHORTCUTS
+
+" }}}1
+
 command! SyntasticJavacEditClasspath call s:EditClasspath()
 
 if g:syntastic_java_javac_config_file_enabled
@@ -131,10 +142,8 @@ function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
     if g:syntastic_java_javac_custom_classpath_command !=# ''
         " Pre-process the classpath command string a little.
         let classpath_command = g:syntastic_java_javac_custom_classpath_command
-        for sub in [['\V%FILE_PATH%', expand('%:p')],
-            \       ['\V%FILE_NAME%', expand('%:t')],
-            \       ['\V%FILE_DIR%',  expand('%:p:h')]]
-            let classpath_command = substitute(classpath_command, sub[0], syntastic#util#shescape(sub[1]), 'g')
+        for [key, val] in items(s:_FILE_SHORTCUTS)
+            let classpath_command = substitute(classpath_command, '\V' . key, syntastic#util#shexpand(val), 'g')
         endfor
         let lines = syntastic#util#system(classpath_command)
         if syntastic#util#isRunningWindows() || has('win32unix')
