+set smartindent

[dotvim.git] / vimrc

diff --git a/vimrc b/vimrc
index bff6db09580640db0a288a17474d8cc19b4566b1..4e5fc18da6e901967fa49fb12f7106e79033c13d 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -34,6 +34,7 @@ set number
 set lazyredraw
 
 set autoindent
+set smartindent
 set expandtab
 set tabstop=4
 set softtabstop=4
@@ -41,8 +42,6 @@ set shiftwidth=4
 
 set pastetoggle=<F3>
 
-set scrolloff=5
-"set sidescrolloff=10
 set encoding=utf-8
 set modeline
 
@@ -96,8 +95,7 @@ nnoremap <C-l> <C-W>l
 nnoremap <Leader>i a'" <<  << "' <Esc>6hi
 nnoremap <Leader>a a'{}' <Esc>2hi
 nnoremap <Leader>A a'"+  +"' <Esc>4hi
-
-nnoremap <Leader>A a'"+  +"' <Esc>4hi
+autocmd FileType cpp nnoremap <Leader>a a'"<<  <<"' <Esc>5hi
 
 " see :h restore-position
 nnoremap <Leader>= msgg=G`s
@@ -133,8 +131,10 @@ nnoremap <C-l> <C-W>l
 
 " Copy paste to/from system clipboard
 vnoremap <C-c> "*y
-inoremap <C-S-v> <esc>"*p
-vnoremap <C-S-v> "*p
+noremap  <C-v> "*p
+noremap  <C-V> "*p
+inoremap <C-v> <esc>"*p
+vnoremap <C-v> "*p
 
 "nnoremap <Leader>= mzgg=G`z<CR>
 nnoremap <F2> :call FormatDocument()<CR>
@@ -185,11 +185,14 @@ set list listchars=tab:→\ ,trail:·
 hi Visual  guifg=White guibg=Blue gui=bold
 
 set diffopt+=vertical
-set diffopt+=iwhite
+"set diffopt+=iwhite
 set diffopt+=algorithm:patience
 "jump to next diff and center line
 noremap <leader>n ]cz.
 noremap <leader>p [cz.
+if has ('win32')
+    set guifont=DejaVu_Sans_Mono:h11:cANSI:qDRAFT
+endif
 if &diff
     " ignore whitespace
     set diffopt+=vertical
@@ -201,7 +204,7 @@ if &diff
     " go fullscreen:
     if has ('win32')
         autocmd GuiEnter * simalt ~x
-        set guifont=DejaVu_Sans_Mono:h10:cANSI:qDRAFT
+        set guifont=DejaVu_Sans_Mono:h8:cANSI:qDRAFT
     endif
     " make all diff windows the same size
     autocmd VimResized * wincmd =
@@ -225,6 +228,7 @@ else
 
 endif
 
+
 " remove currently unused fugitive buffers:
 autocmd BufReadPost fugitive://* set bufhidden=delete
 
@@ -402,13 +406,12 @@ if has("patch-7.4.354")
     set lbr
 endif
 
-hi CursorLineNr  term=underline  cterm=underline      ctermfg=White    ctermbg=darkBlue guibg=darkyellow
-hi clear Cursorline
-"hi CursorLine    gui=underline term=underline cterm=underline
+hi CursorLineNr  ctermbg=black guibg=black
+hi CursorLine    ctermbg=black guibg=black
 augroup CursorLine
-    au!
-    au VimEnter,WinEnter,BufWinEnter * setlocal cursorline
-    au WinLeave * setlocal nocursorline
+  au!
+  au VimEnter,WinEnter,BufWinEnter * setlocal cursorline
+  au WinLeave * setlocal nocursorline
 augroup END
 
 packadd! matchit