# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1513790229 28800
# Node ID 6a0c9e43e34e82c4c37bfa5f7b3d67d76874de72
# Parent  f2e130a948428c13a214d25891b2313f895835ec# Parent  5bbd5963591c6bf420d469068fd0b709f81ac209
Merge changes.

diff -r f2e130a94842 -r 6a0c9e43e34e cvim/cvimrc
--- a/cvim/cvimrc	Tue Dec 12 22:34:11 2017 -0800
+++ b/cvim/cvimrc	Wed Dec 20 09:17:09 2017 -0800
@@ -23,5 +23,10 @@
 
 map <Leader>u :restore<Space>
 
+site '*://*.inoreader.com/*' {
+    unmap j
+    unmap k
+}
+
 let configpath = "D:\\Home\\DotFiles\\cvim\\cvimrc"
 set localconfig
diff -r f2e130a94842 -r 6a0c9e43e34e vim/vimrc
--- a/vim/vimrc	Tue Dec 12 22:34:11 2017 -0800
+++ b/vim/vimrc	Wed Dec 20 09:17:09 2017 -0800
@@ -188,7 +188,7 @@
 set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:.
 
 " Nice auto-complete menu.
-set complete=.,w,b,u,t
+set complete=.,w,b
 set completeopt=longest,menuone,preview
 
 " Column indicators.
@@ -281,6 +281,12 @@
 
 " }}}
 
+" FZF {{{
+
+
+
+" }}}
+
 " Gutentags {{{
 
 let g:gutentags_cache_dir = s:vim_home.'/tags'
@@ -299,6 +305,7 @@
 " I could maybe replace pyflakes with frosted?
 let g:syntastic_python_checkers = ['flake8'] ", 'pylint']
 let g:syntastic_python_python_exec = 'python3'
+let g:syntastic_python_flake8_args='--ignore=W191,W391'
 
 " }}}
 
@@ -466,8 +473,15 @@
 
 augroup VimRCFileType_c
     au!
-    autocmd FileType c,c++,cpp,cs setlocal foldmethod=syntax
-    autocmd FileType c,c++,cpp,cs setlocal colorcolumn=120
+    autocmd FileType c,c++,cpp setlocal foldmethod=syntax
+    autocmd FileType c,c++,cpp setlocal colorcolumn=120
+augroup END
+
+augroup VimRCFileType_csharp
+    au!
+    autocmd BufNewFile,BufRead *.xaml setlocal filetype=xml
+    autocmd FileType cs setlocal foldmethod=syntax
+    autocmd FileType cs setlocal colorcolumn=120
 augroup END
 
 augroup VimRCFileType_css
@@ -548,14 +562,6 @@
 " Clear search matches
 nnoremap <leader><space> :noh<cr>:call clearmatches()<cr>
 
-" Ctrl-P mappings.
-nnoremap <silent> <C-p> :CtrlP<cr>
-nnoremap <silent> <C-o> :CtrlPBuffer<cr>
-nnoremap <silent> <C-u> :CtrlPTag<cr>
-nnoremap <silent> <C-y> :CtrlPBufTag<cr>
-nnoremap <silent> <Tab> :CtrlPMRUFiles<cr>
-nnoremap <silent> <F8> :CtrlPBookmarkDir<cr>
-
 " Switch between FR and US keyboard layouts.
 nnoremap <C-l>f :setlocal keymap=french<cr>
 nnoremap <C-l>u :setlocal keymap=<cr>
@@ -621,11 +627,64 @@
 nnoremap N Nzvzz
 
 " YCM mappings.
-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>
+augroup VimRC_YouCompleteMe
+  autocmd!
+  autocmd FileType cpp nnoremap <Leader>jj :YcmCompleter GoToImprecise<cr>zv
+  autocmd FileType cpp nnoremap <Leader>jd :YcmCompleter GoToDefinition<cr>zv
+  autocmd FileType cpp nnoremap <Leader>jh :YcmCompleter GoToDeclaration<cr>zv
+  autocmd FileType cpp nnoremap <Leader>ji :YcmCompleter GoToInclude<cr>
+  autocmd FileType cpp nnoremap <Leader>jc  :YcmCompleter GetDoc<cr>
+augroup END
+
+" OmniSharp mappings
+augroup VimRC_OmniSharp
+  autocmd!
+  autocmd FileType cs setlocal omnifunc=OmniSharp#Complete
+  autocmd BufEnter,TextChanged,InsertLeave *.cs SyntasticCheck
+  autocmd CursorHold *.cs call OmniSharp#TypeLookupWithoutDocumentation()
+  autocmd FileType cs nnoremap <Leader>jj :OmniSharpGotoDefinition<cr>
+  autocmd FileType cs nnoremap <Leader>x  :OmniSharpFixIssue<cr>
+  autocmd FileType cs nnoremap <Leader>fx :OmniSharpFixUsings<cr>
+  autocmd FileType cs nnoremap <Leader>tt :OmniSharpTypeLookup<cr>
+  autocmd FileType cs nnoremap <Leader>dc :OmniSharpDocumentation<cr>
+augroup END
+
+" ProjectRoot mappings
+let s:no_auto_projectroot_buftypes = [
+      \'help', 'nofile', 'quickfix']
+
+function! s:AutoProjectRootCD() abort
+  try
+    if index(s:no_auto_projectroot_buftypes, &buftype) == -1
+      ProjectRootCD
+    endif
+  catch
+    " Silently ignore invalid buffers
+  endtry
+endfunction
+
+augroup VimRC_ProjectRoot
+  autocmd!
+  autocmd BufEnter * call <SID>AutoProjectRootCD()
+augroup END
+
+nnoremap <leader>cd :ProjectRootCD<cr>
+
+" Ctrl-P mappings.
+if index(g:pathogen_disabled, 'ctrlp') < 0
+  nnoremap <silent> <C-p> :CtrlP<cr>
+  nnoremap <silent> <C-o> :CtrlPBuffer<cr>
+  nnoremap <silent> <C-u> :CtrlPTag<cr>
+  nnoremap <silent> <C-y> :CtrlPBufTag<cr>
+  nnoremap <silent> <Tab> :CtrlPMRUFiles<cr>
+  nnoremap <silent> <F8> :CtrlPBookmarkDir<cr>
+endif
+
+" FZF mappings.
+if index(g:pathogen_disabled, 'fzf') < 0
+  nnoremap <silent> <C-p> :Files
+  nnoremap <silent> <C-o> :Buffers
+endif
 
 " }}}
 
@@ -638,7 +697,7 @@
 set foldnestmax=2
 
 " Folds are defined by markers in the text.
-set foldmethod=marker
+set foldmethod=marker"{{{"}}}
 
 " Toggle folds with <space>.
 nnoremap <space> za
@@ -682,7 +741,7 @@
 endfunction
 
 function! s:FindInNERDTree() abort
-    NERDTreeFind
+    ProjectRootExe NERDTreeFind
     normal zz
 endfunction