diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2014-12-18 11:24:57 +0000 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2014-12-18 11:24:57 +0000 |
| commit | fddba9c7230fd55c0399b7fc4acf757a9aadc2e6 (patch) | |
| tree | eea5ecf3855baf48af16d6f9d11ea7d05179aa72 /vim/vimrc | |
| parent | 136db20338f8bad9083fd5bf9512c5742727a985 (diff) | |
| parent | d54ed015135d0b287c37c0a0dd76e4d3fd646549 (diff) | |
solving merge conflict
Diffstat (limited to 'vim/vimrc')
| -rw-r--r-- | vim/vimrc | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -23,6 +23,7 @@ Plugin 'altercation/vim-colors-solarized' Plugin 'honza/vim-snippets' filetype plugin indent on +syntax on "" Configuration @@ -99,6 +100,7 @@ set tabstop=4 set softtabstop=4 set shiftwidth=4 set autoindent +set breakindent " set cindent " Folds @@ -173,7 +175,6 @@ autocmd! BufNewFile,BufRead,BufWrite * :call UpdateColorscheme() "" Custom mappings - " General nnoremap <Leader>te :tabedit nnoremap <Leader>tn :tabnew<cr> @@ -189,7 +190,7 @@ nnoremap <Leader>sc :source % nnoremap <Return> o<Esc> nnoremap <s-Return> O<Esc> nnoremap J mzJ`z -nnoremap - za +" nnoremap - za nnoremap <c-y> 3<c-y> nnoremap <c-e> 3<c-e> |