Merge remote-tracking branch 'origin/master' into everard

Conflicts:
	vimrc
This commit is contained in:
Thomas Ruoff
2014-07-04 09:25:33 +02:00

24
vimrc
View File

@@ -11,6 +11,7 @@ call vundle#begin()
Plugin 'gmarik/Vundle.vim' Plugin 'gmarik/Vundle.vim'
Plugin 'L9' Plugin 'L9'
Plugin 'unimpaired.vim'
Plugin 'clones/vim-fuzzyfinder' Plugin 'clones/vim-fuzzyfinder'
Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/nerdtree'
@@ -183,16 +184,11 @@ nmap <silent> <leader>ii :set invrelativenumber<CR>
" accomondate with german keyboard " accomondate with german keyboard
" LATIN SMALL LETTER SHARP S nnoremap ß <C-]>
noremap <Char-252> <C-]> nnoremap Ä }
" LATIN CAPITAL A WITH DIAERESIS nnoremap Ö {
noremap <Char-196> } nnoremap ä ]
" LATIN CAPITAL O WITH DIAERESIS nnoremap ö [
noremap <Char-214> {
" LATIN SMALL A WITH DIAERESIS
noremap <Char-228> ]
" LATIN SMALL O WITH DIAERESIS
noremap <Char-246> [
if exists('+relativenumber') if exists('+relativenumber')
set relativenumber set relativenumber
@@ -241,11 +237,11 @@ let g:NERDTreeShowHidden=1
" Unimpaired " Unimpaired
" bubble single lines " bubble single lines
nmap <C-Up> [e nmap <leader>k [e
nmap <C-Down> ]e nmap <leader>j ]e
" bubble multiple lines " bubble multiple lines
vmap <C-Up> [egv vmap <leader>k [egv
vmap <C-Down> ]egv vmap <leader>j ]egv
" yankstack " yankstack
nmap <leader>p <Plug>yankstack_substitute_older_paste nmap <leader>p <Plug>yankstack_substitute_older_paste