darkwiiplayer/darkrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed some my own stupid mistake while merging :/

Browse source
This commit is contained in:
Talia 2017-10-05 19:06:37 +02:00 committed by GitHub
parent 5e367a8732
commit a789c0f15e
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vimrc
View file

@ -127,15 +127,12 @@ set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab
set t_Co=256 set t_Co=256
" Remapping some things " Remapping some things
vmap <C-f> :fold<CR> vmap <C-f> :fold<CR>
<<<<<<< HEAD
" nmap <C-b> :bprevious<CR> " nmap <C-b> :bprevious<CR>
noremap <space> : noremap <space> :
nnoremap <C-s> :w<enter> nnoremap <C-s> :w<enter>
nnoremap <C-x> :bdelete<enter> nnoremap <C-x> :bdelete<enter>
nnoremap <C-n> :bnext<enter> nnoremap <C-n> :bnext<enter>
nnoremap <C-p> :bprevious<enter> nnoremap <C-p> :bprevious<enter>
=======
>>>>>>> 621eebbe99c4cf7a82a1ee8875b122be5b59cff4
" Retab mappings " Retab mappings
nnoremap <S-tab> :retab!<enter> nnoremap <S-tab> :retab!<enter>
nnoremap <S-tab><S-tab> :setl expandtab!<enter>:set expandtab?<enter> nnoremap <S-tab><S-tab> :setl expandtab!<enter>:set expandtab?<enter>