diff options
| author | Matthias Brändli <matthias.braendli@u-blox.com> | 2016-09-29 10:10:54 +0200 |
|---|---|---|
| committer | Matthias Brändli <matthias.braendli@u-blox.com> | 2016-09-29 10:10:54 +0200 |
| commit | 12f92e7eb360a9e1ba04a5d58157d661c6008315 (patch) | |
| tree | d12c41ad493bc4c5b9d9db584592c87fdf38ca1e /dotvimrc | |
| parent | 8f86bcc50030426cd3b0d3b3ec565e35225b6249 (diff) | |
| parent | 763e6c068cdea8978ed324ac16e028b70310c970 (diff) | |
| download | vimrc-12f92e7eb360a9e1ba04a5d58157d661c6008315.tar.gz vimrc-12f92e7eb360a9e1ba04a5d58157d661c6008315.tar.bz2 vimrc-12f92e7eb360a9e1ba04a5d58157d661c6008315.zip | |
Merge 'origin/master'
Diffstat (limited to 'dotvimrc')
| -rw-r--r-- | dotvimrc | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -15,6 +15,8 @@ set number set grepprg=grep\ -nH\ $* let g:tex_flavor = "latex" +setglobal formatoptions+=j + " so that :find and :tabfind work set path=$PWD/** @@ -94,7 +96,6 @@ let g:ycm_always_populate_location_list = 1 NeoBundle 'tpope/vim-surround.git' NeoBundle 'taglist.vim' NeoBundle 'ifdef-highlighting' -NeoBundle 'tpope/vim-speeddating' " can do C-A and C-X on dates! NeoBundle 'ciaranm/detectindent' "adapts tabstop and this shit automagically NeoBundle "scrooloose/nerdtree" @@ -120,7 +121,7 @@ if has("nvim") elseif has("gui_running") if has("gui_gtk2") - set guifont=Inconsolata\ Medium\ 12 + set guifont=Source\ Code\ Pro\ Medium\ 10 elseif has("gui_win32") set guifont=Lucida_Console:h10:cANSI endif @@ -225,6 +226,8 @@ endfun noremap <F4> :call MPB_Flip_Ext()<CR> noremap <Leader>f :call MPB_Flip_Ext()<CR> +noremap <Leader>m :make -j4<CR> + "Show trailing whitespace highlight ExtraWhitespace ctermbg=darkgreen guibg=#344011 autocmd BufEnter * exe ':2match ExtraWhitespace /\s\+$\| \+\ze\t\|\t\+\ze /' |