# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1532360960 0
# Node ID 4049cfd97ffb1695e4f5337d278002646d4ad147
# Parent  dca6294262582bf864b9b91435ab57aec83a5c0b# Parent  3f66d0d6e710341d8361e1a0b88536dd26d8444b
Merge.

diff -r 3f66d0d6e710 -r 4049cfd97ffb .hgsub
--- a/.hgsub	Sat Jul 21 02:37:37 2018 +0000
+++ b/.hgsub	Mon Jul 23 15:49:20 2018 +0000
@@ -1,43 +1,40 @@
 mercurial/hg-prompt              = [hg]https://bitbucket.org/sjl/hg-prompt
 mercurial/templates              = [hg]https://bitbucket.org/sjl/mercurial-cli-templates
-vim/bundle/abolish               = [git]git://github.com/tpope/vim-abolish.git
-vim/bundle/ack                   = [git]git://github.com/mileszs/ack.vim.git
+vim/bundle/abolish               = [git]https://github.com/tpope/vim-abolish
+vim/bundle/ack                   = [git]https://github.com/mileszs/ack.vim
 vim/bundle/badwolf               = [hg]https://bitbucket.org/sjl/badwolf/
 vim/bundle/clam                  = [hg]https://bitbucket.org/sjl/clam.vim/
-vim/bundle/clojure-static        = [git]git://github.com/guns/vim-clojure-static.git
-vim/bundle/commentary            = [git]git://github.com/tpope/vim-commentary.git
-vim/bundle/ctrlp                 = [git]git://github.com/ctrlpvim/ctrlp.vim.git
-vim/bundle/delimitmate           = [git]git://github.com/Raimondi/delimitMate.git
-vim/bundle/dispatch              = [git]git://github.com/tpope/vim-dispatch.git
-vim/bundle/fireplace             = [git]git://github.com/tpope/vim-fireplace.git
-vim/bundle/fugitive              = [git]git://github.com/tpope/vim-fugitive.git
+vim/bundle/commentary            = [git]https://github.com/tpope/vim-commentary
+vim/bundle/ctrlp                 = [git]https://github.com/ctrlpvim/ctrlp.vim
+vim/bundle/delimitmate           = [git]https://github.com/Raimondi/delimitMate
+vim/bundle/fugitive              = [git]https://github.com/tpope/vim-fugitive
 vim/bundle/gdl                   = [hg]https://bitbucket.org/sjl/gdl.vim/
-vim/bundle/glsl                  = [git]git://github.com/tikhomirov/vim-glsl.git
-vim/bundle/gnuplot               = [git]git://github.com/vim-scripts/gnuplot.vim.git
+vim/bundle/glsl                  = [git]https://github.com/tikhomirov/vim-glsl
+vim/bundle/gnupg                 = [git]https://github.com/jamessan/vim-gnupg
+vim/bundle/gnuplot               = [git]https://github.com/vim-scripts/gnuplot.vim
 vim/bundle/gundo                 = [hg]https://bitbucket.org/sjl/gundo.vim/
-vim/bundle/html5                 = [git]git://github.com/othree/html5.vim.git
-vim/bundle/indent-object         = [git]git://github.com/michaeljsmith/vim-indent-object.git
-vim/bundle/javascript            = [git]git://github.com/pangloss/vim-javascript.git
-vim/bundle/markdown              = [git]git://github.com/tpope/vim-markdown.git
-vim/bundle/miniyank              = [git]git://github.com/bfredl/nvim-miniyank.git
-vim/bundle/nerdtree              = [git]git://github.com/scrooloose/nerdtree.git
+vim/bundle/html5                 = [git]https://github.com/othree/html5.vim
+vim/bundle/indent-object         = [git]https://github.com/michaeljsmith/vim-indent-object
+vim/bundle/javascript            = [git]https://github.com/pangloss/vim-javascript
+vim/bundle/markdown              = [git]https://github.com/tpope/vim-markdown
+vim/bundle/miniyank              = [git]https://github.com/bfredl/nvim-miniyank
+vim/bundle/nerdtree              = [git]https://github.com/scrooloose/nerdtree
 vim/bundle/paredit               = [hg]https://bitbucket.org/kovisoft/paredit/
-vim/bundle/pgsql                 = [git]git://github.com/exu/pgsql.vim.git
-vim/bundle/python-mode           = [git]git://github.com/klen/python-mode.git
-vim/bundle/rainbow-parentheses   = [git]git://github.com/kien/rainbow_parentheses.vim.git
-vim/bundle/repeat                = [git]git://github.com/tpope/vim-repeat.git
-vim/bundle/rhubarb               = [git]git://github.com/tpope/vim-rhubarb.git
+vim/bundle/pgsql                 = [git]https://github.com/exu/pgsql.vim
+vim/bundle/python-mode           = [git]https://github.com/klen/python-mode
+vim/bundle/rainbow-parentheses   = [git]https://github.com/kien/rainbow_parentheses.vim
+vim/bundle/repeat                = [git]https://github.com/tpope/vim-repeat
+vim/bundle/rhubarb               = [git]https://github.com/tpope/vim-rhubarb
 vim/bundle/scala                 = [git]git://github.com/derekwyatt/vim-scala
-vim/bundle/securemodelines       = [git]git://github.com/ciaranm/securemodelines.git
-vim/bundle/sexp                  = [git]git://github.com/guns/vim-sexp.git
-vim/bundle/shaderhighlight       = [git]git://github.com/vim-scripts/ShaderHighLight.git
+vim/bundle/securemodelines       = [git]https://github.com/ciaranm/securemodelines
+vim/bundle/sexp                  = [git]https://github.com/guns/vim-sexp
+vim/bundle/shaderhighlight       = [git]https://github.com/vim-scripts/ShaderHighLight
 vim/bundle/splice                = [hg]https://bitbucket.org/sjl/splice.vim
 vim/bundle/strftimedammit        = [hg]https://bitbucket.org/sjl/strftimedammit.vim/
-vim/bundle/surround              = [git]git://github.com/tpope/vim-surround.git
-vim/bundle/swig                  = [git]git://github.com/vim-scripts/SWIG-syntax.git
-vim/bundle/syntastic             = [git]git://github.com/scrooloose/syntastic.git
-vim/bundle/targets               = [git]git://github.com/wellle/targets.vim.git
-vim/bundle/vimtex                = [git]git://github.com/lervag/vimtex.git
+vim/bundle/surround              = [git]https://github.com/tpope/vim-surround
+vim/bundle/swig                  = [git]https://github.com/vim-scripts/SWIG-syntax
+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
-vim/bundle/vlime                 = [git]git://github.com/sjl/vlime.git
-vim/bundle/windowswap            = [git]git://github.com/wesQ3/vim-windowswap.git
+vim/bundle/vlime                 = [git]https://github.com/sjl/vlime
+vim/bundle/windowswap            = [git]https://github.com/wesQ3/vim-windowswap
diff -r 3f66d0d6e710 -r 4049cfd97ffb .hgsubstate
--- a/.hgsubstate	Sat Jul 21 02:37:37 2018 +0000
+++ b/.hgsubstate	Mon Jul 23 15:49:20 2018 +0000
@@ -4,38 +4,35 @@
 a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
 5e4a535e2d239cba3db19b6b79abedbc7c541727 vim/bundle/badwolf
 a4d79fc208764917cb58e2aed6fbaeb5e3356d33 vim/bundle/clam
-fae5710a0b79555fe3296145be4f85148266771a vim/bundle/clojure-static
-be79030b3e8c0ee3c5f45b4333919e4830531e80 vim/bundle/commentary
+8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary
 c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
-6dd4480388e4727dfe5c723484c500e03b429c28 vim/bundle/dispatch
-ea86de69992d487960e9b70e97bfd584ab8ab449 vim/bundle/fireplace
-8f60d1d459362771cb68c0097565efdf52e62ec3 vim/bundle/fugitive
+196e44837555e0e05080e6bc9dfc5605a06eaabb vim/bundle/fugitive
 127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
 6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
+7fcea1a08423da3012aac87f5224738c85d212a1 vim/bundle/gnupg
 0d57b080f9fae8573c688b6679b31eb1666edc4c vim/bundle/gnuplot
 1d84591fff04caebab75cba2294fc3843f0a4a29 vim/bundle/gundo
 fccd580f5f11d576169ee347907c9fbd77af410a vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
-395f8901b34cc871c9576886938a6efda0eb7268 vim/bundle/javascript
+39e332a3c36c0115e1eab85c34cf121b7585869d vim/bundle/javascript
 dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
-528e111b9fa32452366f382d50e998536d3ded85 vim/bundle/miniyank
-a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
+1362fdc7c32855794659cafe6e65d3239843d9df vim/bundle/miniyank
+d6032c876c6d6932ab7f07e262a16c9a85a31d5b vim/bundle/nerdtree
 f506af01e84e53643e0760b7f43c74069ce16c85 vim/bundle/paredit
 1a436f7d875b4ec630da081b041c73264235c7e7 vim/bundle/pgsql
-fd70ac2ab74a91fb049cb8e82237c34d88354673 vim/bundle/python-mode
+d241974f40e8d206f9970e51fb0069951862ba35 vim/bundle/python-mode
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
-7a6675f092842c8f81e71d5345bd7cdbf3759415 vim/bundle/repeat
-6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a vim/bundle/rhubarb
+43d2678fa59d068c815d8298331c195e850ff5a7 vim/bundle/repeat
+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 3f66d0d6e710 -r 4049cfd97ffb vim/vimrc
--- a/vim/vimrc	Sat Jul 21 02:37:37 2018 +0000
+++ b/vim/vimrc	Mon Jul 23 15:49:20 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 .= " "
@@ -2115,52 +2116,6 @@
 let delimitMate_expand_cr = 1
 
 " }}}
-" Dispatch {{{
-
-nnoremap <leader>d :Dispatch<cr>
-nnoremap <leader>m :Dispatch<cr>
-
-" }}}
-" Fireplace {{{
-
-let g:fireplace_no_maps = 1
-
-augroup map_good_fireplace_keys
-    au!
-
-    " [M]an (get documentation)
-    au Filetype clojure nmap <buffer> M <Plug>FireplaceK
-
-    " Go to Definition
-    au Filetype clojure nmap <buffer> <c-]> <Plug>FireplaceDjumpmzzvzz15<c-e>'z:Pulse<cr>
-    au Filetype clojure nmap <buffer> <c-\> <c-w>v<Plug>FireplaceDjumpmzzMzvzz15<c-e>'z:Pulse<cr>
-
-    " Require
-    au Filetype clojure nnoremap <buffer> <localleader>r :Require<cr>
-
-    " Require Harder
-    au Filetype clojure nnoremap <buffer> <localleader>R :Require!<cr>
-
-    " Get [S]ource
-    " au Filetype clojure nmap <buffer> <localleader>s <Plug>FireplaceSource
-
-    " Eval Buffer
-    au Filetype clojure nnoremap <buffer> <localleader>b :%Eval<cr>
-
-    " Eval Form
-    au Filetype clojure nmap <buffer> <localleader>f <Plug>FireplacePrintab
-
-    " Eval Top-Level Form
-    au Filetype clojure nmap <buffer> <localleader>e mz$:call PareditFindDefunBck()<cr><Plug>FireplacePrintab'z
-
-    " Open clojure command line editor client window thing
-    au Filetype clojure exe 'nmap <buffer> <localleader>E <Plug>FireplacePrompt' . &cedit . 'i'
-
-    " [S]how Last Result
-    au Filetype clojure nnoremap <buffer> <localleader>s :Last<cr>
-augroup END
-
-" }}}
 " Fugitive {{{
 
 nnoremap <leader>gd :Gdiff<cr>
@@ -2596,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 = "-"