# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1647629829 14400
# Node ID 2f65feeb03931aa9ef3bc1e1ddfd51ca014d30e8
# Parent  5a6fddbe0c85502454c80f3b1b93425a1285596f# Parent  682defd712196f00b3ca94cad6d44aa087098ef0
Merge

diff -r 5a6fddbe0c85 -r 2f65feeb0393 .hgsub
--- a/.hgsub	Fri Mar 18 14:56:50 2022 -0400
+++ b/.hgsub	Fri Mar 18 14:57:09 2022 -0400
@@ -8,7 +8,6 @@
 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/firenvim              = [git]https://github.com/glacambre/firenvim
 vim/bundle/fugitive              = [git]https://github.com/tpope/vim-fugitive
 vim/bundle/gdl                   = [hg]ssh://hg.stevelosh.com/repos/gdl.vim/
 vim/bundle/glsl                  = [git]https://github.com/tikhomirov/vim-glsl
diff -r 5a6fddbe0c85 -r 2f65feeb0393 .hgsubstate
--- a/.hgsubstate	Fri Mar 18 14:56:50 2022 -0400
+++ b/.hgsubstate	Fri Mar 18 14:57:09 2022 -0400
@@ -8,7 +8,6 @@
 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary
 c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
-f62386a9edd8b24fe1155d998be0fa56e8d8ff85 vim/bundle/firenvim
 755554bb3c44944f70f4b2048acf0c69261782ac vim/bundle/fugitive
 127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
 6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
diff -r 5a6fddbe0c85 -r 2f65feeb0393 vim/vimrc
--- a/vim/vimrc	Fri Mar 18 14:56:50 2022 -0400
+++ b/vim/vimrc	Fri Mar 18 14:57:09 2022 -0400
@@ -2108,33 +2108,6 @@
 let delimitMate_expand_cr = 1
 
 " }}}
-" Firenvim {{{
-"
-let g:firenvim_config = { 
-    \ 'globalSettings': {
-        \ 'takeover': 'never',
-    \  },
-    \ 'localSettings': {
-        \ '.*': {
-            \ 'takeover': 'never',
-        \ },
-    \ }
-\ }
-
-if exists('g:started_by_firenvim')
-  set laststatus=0
-  set guifont=Ubuntu\ Mono:h10
-else
-  set laststatus=2
-endif
-
-augroup ft_fugitive
-    au!
-
-    au BufEnter github.com_*.txt set filetype=markdown
-augroup END
-
-" }}}
 " Fugitive {{{
 
 nnoremap <leader>gd :Gdiff<cr>