--- a/.hgignore	Wed Aug 09 21:40:36 2017 -0700
+++ b/.hgignore	Tue Aug 22 13:11:51 2017 -0700
@@ -9,6 +9,7 @@
 git/gitconfig-local
 hgrc/hgrc-local
 vim/vimrc-local
+vim/vimrc-local-pre
 vim/local/
 weechat/logs
 weechat/*.log

--- a/.hgsubstate	Wed Aug 09 21:40:36 2017 -0700
+++ b/.hgsubstate	Tue Aug 22 13:11:51 2017 -0700
@@ -1,5 +1,5 @@
-80a44033b7facf069ddb734fb4e908a95e681b6c lib/fish/virtualfish
-03cc0603800e39d4c73ab965aca7f306e80ca8e1 lib/hg/allpaths
+5c5203cc2a62a65eea3bce3931a8e41938341bcd lib/fish/virtualfish
+772d75b1a0309b89b96c4ad1c0b2f284104de974 lib/hg/allpaths
 871944d0db5cc714bfee2bd6087c380d3ef6a96f lib/hg/fast-hg-prompt
 4d63f2eb60fd6399d5f50d4703d8ced8132ce359 lib/hg/hg-git
 7d99080f276f49e3638ba13b4f5c1cd2dc4cc21f lib/hg/hg-git-sync
@@ -9,43 +9,43 @@
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 8e91a585024cdf2d14adaf548c21799edce0d6c0 lib/hg/path-pattern
 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status
-8fe9da9868ae56503e9bf0ae8f7c6bc508d46093 lib/iterm2/color-schemes
+518f474f8414e3553fab0e909e5087bc06cc5279 lib/iterm2/color-schemes
 3b23c55eb43849975656dd89e3f35dacd2b93e69 mutt/mutt-colors-solarized
 47ee7952433b327724bac20ef720ec22e0e0782b pentadactyl/plugins/pintaboard
 4a0dd6e190f446e5a016b44fdaa2feafc582918e vim/bundle/ag
 a6f651fa86068b8edb6799c9979a71e40caa3b42 vim/bundle/badwolf
 b8dff40f69f1873effbed97c759a8452ecb240ed vim/bundle/colorschemes
-73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 vim/bundle/commentary
+be79030b3e8c0ee3c5f45b4333919e4830531e80 vim/bundle/commentary
 7fa89fec125ce60a341f7c37dd769a8a31c49359 vim/bundle/ctrlp
-27a7cac20253d96af5e3801055d417a1ad473fa8 vim/bundle/ctrlp-py-matcher
-af9786ee5780bf0cbafbd7b341c2b5234d18c1c0 vim/bundle/easymotion
-f44845e4408aae03e018e98afb7fbf0c2ee87dd5 vim/bundle/fugitive
+2f6947480203b734b069e5d9f69ba440db6b4698 vim/bundle/ctrlp-py-matcher
+e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50 vim/bundle/easymotion
+913fff1cea3aa1a08a360a494fa05555e59147f5 vim/bundle/fugitive
 9dd2d48255fcc3ac5122f6028dc238fabcccd861 vim/bundle/gundo
-f7a417234deadb6283bfb2c437d4f11cd2f7ab55 vim/bundle/gutentags
-1f2e47c78c2faf90ff419c2f4e1241094844678c vim/bundle/haml
-adebc6ceae0aed69bb1cde7fb89058fb1546129e vim/bundle/interestingwords
+685b81826b68135f00bb8d66eb8b9f2cbc394bcd vim/bundle/gutentags
+d580aa3a3f8b576425188be64381047c7b993112 vim/bundle/haml
+0278ab2ede1ea94f2523c53d6d694a84479b2124 vim/bundle/interestingwords
 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja
 c9169233d45ae2f0fefa0feb9ee816a87c6b05c8 vim/bundle/lawrencium
 6e818d5614d5fc18d95a48c92b89e6db39f9e3d6 vim/bundle/less
-a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a vim/bundle/lightline
-1633535197ad9757ac7f107e03b4d08e7d45d03d vim/bundle/linediff
-3c2215bfed1de1251927fbc94b2631ca27c2958f vim/bundle/markdown
-281701021c5001332a862da80175bf585d24e2e8 vim/bundle/nerdtree
-020ab25c38f62627c1dab6c7a851176c6ad309f9 vim/bundle/pathogen
+08f9e22c9ae4b9ecce32e7a617ef82cd419a8ace vim/bundle/lightline
+84165cad088402ef04906dfc9cd2eb4b2bf071fa vim/bundle/linediff
+a7dbc314569aa85db80c106d73b1664e385b6ae7 vim/bundle/markdown
+5782b228e495c733af4ba2e547e5dc44ebc8bc25 vim/bundle/nerdtree
+e7857bed4e0705f91f781dbe99706f07d08d104b vim/bundle/pathogen
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
-432ce307b11ce9913aaf2f7594c57ca262ed63a5 vim/bundle/projectroot
-8b215aac0192f74b5aeb6ae5a2e1766db2ebecb8 vim/bundle/python-pep8-indent
-2f850dcf506af85be22365aebda6ff737e5f004e vim/bundle/pythonmode
-9378cddc1c264f777af59f04e5b8d64eca8ee5fd vim/bundle/ragtag
-7a6675f092842c8f81e71d5345bd7cdbf3759415 vim/bundle/repeat
+68787126ebbbe50e120e497ff63696b22f636840 vim/bundle/projectroot
+90e00b6189ace2b85192d74ce40929fe9d665062 vim/bundle/python-pep8-indent
+ed80fdebb5eb5e0e7e404484371221633a3926f6 vim/bundle/pythonmode
+5762a937f39d165b9773376960539f8c32788325 vim/bundle/ragtag
+070ee903245999b2b79f7386631ffd29ce9b8e9f vim/bundle/repeat
 1644a567c103c71e2f91bc9a362e906c515d6e4a vim/bundle/scratch
-62c4f261874dd44e6cdc6788b4a6bc59f9dfe746 vim/bundle/sleuth
+dfe0a33253c61dd8fac455baea4ec492e6cf0fe3 vim/bundle/sleuth
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
-cdaa5c27c5a7f8b08a43d0b2e65929512299e33a vim/bundle/supertab
+22aac5c2cb6a8ebe906bf1495eb727717390e62e vim/bundle/supertab
 e49d6c2459e0f5569ff2d533b4df995dd7f98313 vim/bundle/surround
-6fb14d624b6081459360fdbba743f82cf84c8f92 vim/bundle/syntastic
-959f48798136bfd4ce60075d3c86c580fcf5e5c5 vim/bundle/tagbar
+5e1b26c1724448c9d870b08dc93ce71528489333 vim/bundle/syntastic
+da87ee943986a3f23800af689f84d9814c042ad1 vim/bundle/tagbar
 6845221d45bd62e604c2024bc511a56e79d1118b vim/bundle/todo.txt
 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom

--- a/hgrc/hgrc-Windows_NT	Wed Aug 09 21:40:36 2017 -0700
+++ b/hgrc/hgrc-Windows_NT	Tue Aug 22 13:11:51 2017 -0700
@@ -1,6 +1,6 @@
 [ui]
 ssh = "%USERPROFILE%\Dropbox\Utilities\plink.exe" -ssh -2 -batch -C
-editor = "C:\Program Files (x86)\Vim\vim74\vim.exe"
+editor = "C:\Program Files (x86)\Vim\vim80\vim.exe"
 
 [extdiff]
 cmds.wdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"

--- a/vim/vimrc	Wed Aug 09 21:40:36 2017 -0700
+++ b/vim/vimrc	Tue Aug 22 13:11:51 2017 -0700
@@ -31,12 +31,18 @@
 " Get our vim directory. 
 let s:vim_home = expand("<sfile>:h")
 
+" Local pre-override.
+let s:local_vimrc_pre = s:vim_home.'/vimrc-local-pre'
+if filereadable(s:local_vimrc_pre)
+    execute 'source' s:local_vimrc_pre
+endif
+
 " Make sure `filetype` stuff is turned off before loading Pathogen.
 syntax off
 filetype off
 
 " Disable some plugins.
-let g:pathogen_disabled = []
+let g:pathogen_disabled = get(g:, 'pathogen_disabled', [])
 call add(g:pathogen_disabled, 'vimroom')
 call add(g:pathogen_disabled, 'minibufexpl')
 call add(g:pathogen_disabled, 'ragtag')
@@ -255,7 +261,7 @@
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
 " Remember things.
-let g:ctrlp_clear_cache_on_ext = 0
+let g:ctrlp_clear_cache_on_exit = 0
 
 " Don't include some stuff in the most recently used list.
 let g:ctrlp_mruf_exclude = 'hg\-editor\-\d+\.txt'
@@ -364,7 +370,7 @@
       \'colorscheme': 'solarized',
       \'active': {
       \    'left': [ ['mode', 'paste'], 
-      \              ['fugitive', 'lawrencium', 'readonly', 'filename'], 
+      \              ['fugitive', 'lawrencium', 'readonly', 'relativepath', 'modified'], 
       \              ['ctrlpmark'] ],
       \    'right': [ ['lineinfo'], 
       \               ['percent'], 
@@ -430,6 +436,12 @@
 endfunction
 " }}}
 
+" YouCompleteMe {{{
+
+let g:ycm_always_populate_location_list = 1
+
+" }}}
+
 " }}}
 
 " File-Specific Settings {{{
@@ -454,8 +466,8 @@
 
 augroup VimRCFileType_c
     au!
-    autocmd FileType c,c++,cpp setlocal foldmethod=syntax
-    autocmd FileType c,c++,cpp setlocal colorcolumn=120
+    autocmd FileType c,c++,cpp,cs setlocal foldmethod=syntax
+    autocmd FileType c,c++,cpp,cs setlocal colorcolumn=120
 augroup END
 
 augroup VimRCFileType_css
@@ -572,8 +584,9 @@
 nnoremap [j <C-O>
 
 " Copy the current buffer's info.
-nnoremap <leader>cp :let @+ = expand('%:p')<cr>
-nnoremap <leader>cf :let @+ = expand('%:h')<cr>
+nnoremap <leader>cp :let @+ = expand('%:p')<cr>:echo @+<cr>
+nnoremap <leader>cf :let @+ = expand('%:h')<cr>:echo @+<cr>
+nnoremap <leader>cw :let @+ = getcwd()<cr>:echo @+<cr>
 
 " Make the diff navigation also center things.
 nnoremap ]c ]czvzz
@@ -608,9 +621,9 @@
 nnoremap N Nzvzz
 
 " YCM mappings.
-nnoremap <Leader>jj :YcmCompleter GoToImprecise<cr>
-nnoremap <Leader>jd :YcmCompleter GoToDefinition<cr>
-nnoremap <Leader>jh :YcmCompleter GoToDeclaration<cr>
+nnoremap <Leader>jj :YcmCompleter GoToImprecise<cr>zv
+nnoremap <Leader>jd :YcmCompleter GoToDefinition<cr>zv
+nnoremap <Leader>jh :YcmCompleter GoToDeclaration<cr>zv
 nnoremap <Leader>ji :YcmCompleter GoToInclude<cr>
 nnoremap <Leader>jc  :YcmCompleter GetDoc<cr>
 
@@ -621,6 +634,9 @@
 " Start with one level of open.
 set foldlevel=1
 
+" Don't fold too much.
+set foldnestmax=2
+
 " Folds are defined by markers in the text.
 set foldmethod=marker
 
@@ -670,13 +686,6 @@
     normal zz
 endfunction
 
-function! s:AutoProjectRootCD() abort
-  if &buftype == ''
-    ProjectRootCD
-  endif
-endfunction
-autocmd BufEnter * call <SID>AutoProjectRootCD()
-
 " }}}
 
 " Local override {{{