# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1532360830 0
# Node ID dca6294262582bf864b9b91435ab57aec83a5c0b
# Parent  fe3fd6a50ad927ae79379953563c8d8943d44b1a
Update subrepos

diff -r fe3fd6a50ad9 -r dca629426258 .hgsub
--- a/.hgsub	Mon Jul 23 15:43:34 2018 +0000
+++ b/.hgsub	Mon Jul 23 15:47:10 2018 +0000
@@ -33,7 +33,6 @@
 vim/bundle/strftimedammit        = [hg]https://bitbucket.org/sjl/strftimedammit.vim/
 vim/bundle/surround              = [git]https://github.com/tpope/vim-surround
 vim/bundle/swig                  = [git]https://github.com/vim-scripts/SWIG-syntax
-vim/bundle/syntastic             = [git]https://github.com/scrooloose/syntastic
 vim/bundle/targets               = [git]https://github.com/wellle/targets.vim
 vim/bundle/vimtex                = [git]https://github.com/lervag/vimtex
 vim/bundle/vitality              = [hg]https://bitbucket.org/sjl/vitality.vim
diff -r fe3fd6a50ad9 -r dca629426258 .hgsubstate
--- a/.hgsubstate	Mon Jul 23 15:43:34 2018 +0000
+++ b/.hgsubstate	Mon Jul 23 15:47:10 2018 +0000
@@ -24,16 +24,15 @@
 d241974f40e8d206f9970e51fb0069951862ba35 vim/bundle/python-mode
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
 43d2678fa59d068c815d8298331c195e850ff5a7 vim/bundle/repeat
-6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a vim/bundle/rhubarb
+848841083d5d4550b5ebbd3bd67dfb3e5146b64a vim/bundle/rhubarb
 e7640f26e56f0be344d60a6098e05d6928fd396d vim/bundle/scala
 10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
 b4398689f7483b01684044ab6b55bf369744c9b3 vim/bundle/sexp
 e02c3e218c51c1e2ea1821a3fe412d4e09ca1502 vim/bundle/shaderhighlight
 062b18eebd153c13e6f36577707acb17893cd959 vim/bundle/splice
 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
-2d05440ad23f97a7874ebd9b5de3a0e65d25d85c vim/bundle/surround
+aa1f120ad3a29c27cc41d581cda3751c59343cce vim/bundle/surround
 19c3d966440b6cfe8d74251881a48e961ddb8648 vim/bundle/swig
-cd871da6b4515e393ec0ba885423594447980e09 vim/bundle/syntastic
 f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
 bf3fd7f67e730f93765bd3c1cfcdb18fd4043521 vim/bundle/vitality
diff -r fe3fd6a50ad9 -r dca629426258 vim/vimrc
--- a/vim/vimrc	Mon Jul 23 15:43:34 2018 +0000
+++ b/vim/vimrc	Mon Jul 23 15:47:10 2018 +0000
@@ -556,7 +556,8 @@
     let s = ""
 
     if a:winnr == winnr()
-        let errors = SyntasticStatuslineFlag()
+        "let errors = SyntasticStatuslineFlag()
+	let errors = ""
 
         let s .= "%#GWStatusLineMode#"
         let s .= " "
@@ -2550,79 +2551,6 @@
 let g:SuperTabCrMapping = 1
 
 "}}}
-" Syntastic {{{
-
-let g:syntastic_enable_signs = 1
-let g:syntastic_check_on_open = 0
-let g:syntastic_check_on_wq = 0
-let g:syntastic_auto_jump = 0
-let g:syntastic_mode_map = {
-            \ "mode": "active",
-            \ "active_filetypes": [],
-            \ "passive_filetypes": ['java', 'html', 'rst', 'scala']
-            \ }
-let g:syntastic_stl_format = '[%E{%e Errors}%B{, }%W{%w Warnings}]'
-
-nnoremap <leader>C :SyntasticCheck<cr>
-
-" Java
-let g:syntastic_java_checker = 'javac'
-
-" Javascript
-let g:syntastic_jsl_conf = '$HOME/.vim/jsl.conf'
-
-" Python
-let g:syntastic_python_checkers = ['python']
-let g:syntastic_python_python_exec = '/Users/sjl/bin/py3'
-
-" Scala
-let g:syntastic_scala_checkers = ['scalac', 'scalastyle']
-let g:syntastic_scala_checkers = ['fsc']
-let g:syntastic_scala_scalastyle_jar = '/usr/local/Cellar/scalastyle/0.8.0/libexec/scalastyle_2.11-0.8.0-batch.jar'
-let g:syntastic_scala_scalastyle_config_file = '~/src/dotfiles/scalastyle_config.xml'
-
-if has('autocmd')
-  function! FindClasspath(where)
-    let cpf = findfile('.classpath', escape(a:where, ' ') . ';')
-    let sep = syntastic#util#isRunningWindows() || has('win32unix') ? ';' : ':'
-    try
-      return cpf !=# '' ? [ '-classpath', join(readfile(cpf), sep) ] : []
-    catch
-      return []
-    endtry
-  endfunction
-
-  let g:syntastic_scala_scalac_args = [
-    \ '-Xfatal-warnings:false',
-    \ '-Xfuture',
-    \ '-Xlint',
-    \ '-Ywarn-adapted-args',
-    \ '-Ywarn-dead-code', 
-    \ '-Ywarn-inaccessible',
-    \ '-Ywarn-infer-any',
-    \ '-Ywarn-nullary-override',
-    \ '-Ywarn-nullary-unit',
-    \ '-Ywarn-numeric-widen',
-    \ '-Ywarn-unused-import',
-    \ '-Ywarn-value-discard',
-    \ '-deprecation',
-    \ '-encoding', 'UTF-8',
-    \ '-feature',
-    \ '-language:existentials',
-    \ '-language:higherKinds', 
-    \ '-language:implicitConversions',
-    \ '-unchecked',
-    \ '-d', ($TMPDIR !=# '' ? $TMPDIR : '/tmp') ]
-
-  augroup syntastic_scalac
-    autocmd!
-    autocmd FileType scala let b:syntastic_scala_scalac_args =
-      \ get(g:, 'syntastic_scala_scalac_args', []) +
-      \ FindClasspath(expand('<afile>:p:h', 1))
-  augroup END
-endif
-
-" }}}
 " Splice {{{
 
 let g:splice_prefix = "-"