# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1515571536 28800
# Node ID 63463782d1cd1bf567edde2a7612e328ec640ecb
# Parent  1da269c50dca3828612234c05da60d857a139526# Parent  c32b9b17231452e233c40757578378e330c3820f
Merge changes.

diff -r 1da269c50dca -r 63463782d1cd cvim/cvimrc
--- a/cvim/cvimrc	Wed Jan 10 00:02:16 2018 -0800
+++ b/cvim/cvimrc	Wed Jan 10 00:05:36 2018 -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 1da269c50dca -r 63463782d1cd vim/vimrc
--- a/vim/vimrc	Wed Jan 10 00:02:16 2018 -0800
+++ b/vim/vimrc	Wed Jan 10 00:05:36 2018 -0800
@@ -299,6 +299,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'
 
 " }}}
 
@@ -621,11 +622,27 @@
 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
 
 " }}}