hunner/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undo s/noremap/map/ in .vimrc

Browse source
This commit is contained in:
Hunter Haugen 2011-08-11 11:48:50 +10:00
parent d9ca44043a
commit 10dd0922a9
1 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

132
.vimrc
View file

@ -647,28 +647,28 @@ nmap <C--> :colder<CR>
nmap <C-_> :cnewer<CR> nmap <C-_> :cnewer<CR>
" Make S-up/down do gk/gj {{{2 " Make S-up/down do gk/gj {{{2
imap <S-Up> <C-o>gk inoremap <S-Up> <C-o>gk
imap <S-Down> <C-o>gj inoremap <S-Down> <C-o>gj
map <S-Up> gk noremap <S-Up> gk
map <S-Down> gj noremap <S-Down> gj
" Better Bépo movement {{{2 " Better Bépo movement {{{2
map © h noremap © h
map þ j noremap þ j
map ß k noremap ß k
map ® l noremap ® l
" Make <space>/<backspace> page up/down {{{2 " Make <space>/<backspace> page up/down {{{2
map <space> <C-f> noremap <space> <C-f>
map <backspace> <C-b> noremap <backspace> <C-b>
" Scrolling with arrows controls the window {{{2 " Scrolling with arrows controls the window {{{2
map <Up> <C-y> noremap <Up> <C-y>
map <Down> <C-e> noremap <Down> <C-e>
" Useful things from inside imode {{{2 " Useful things from inside imode {{{2
imap <C-z>w <C-o>:w<CR> inoremap <C-z>w <C-o>:w<CR>
imap <C-z>q <C-o>gq}<C-o>k<C-o>$ inoremap <C-z>q <C-o>gq}<C-o>k<C-o>$
" Commonly used commands {{{2 " Commonly used commands {{{2
"nmap <silent> <F3> :silent nohlsearch<CR> "nmap <silent> <F3> :silent nohlsearch<CR>
@ -686,7 +686,7 @@ nmap <Leader><F8> :exec "make -C " . expand("%:p:h")<CR>
" \ . " TESTS=" . GetCurrentTest() <CR> " \ . " TESTS=" . GetCurrentTest() <CR>
" Insert a single char {{{2 " Insert a single char {{{2
map <Leader>i i<Space><Esc>r noremap <Leader>i i<Space><Esc>r
" Split the line into a (n)ew line or an (o)pen line {{{2 " Split the line into a (n)ew line or an (o)pen line {{{2
nmap <Leader>n \i<CR> nmap <Leader>n \i<CR>
@ -696,33 +696,33 @@ nmap <Leader>o \i<CR>k$
noremap <Leader>J :s/\%#\(.*\)\n\(.*\)/\2\1<CR> noremap <Leader>J :s/\%#\(.*\)\n\(.*\)/\2\1<CR>
" In normal mode, jj or jl escapes {{{2 " In normal mode, jj or jl escapes {{{2
imap jj <Esc> inoremap jj <Esc>
imap jl <Esc> inoremap jl <Esc>
" Kill line like emacs {{{2 " Kill line like emacs {{{2
"map <C-k> "_dd "noremap <C-k> "_dd
" Select everything {{{2 " Select everything {{{2
map <Leader>gg ggVG noremap <Leader>gg ggVG
" Reformat everything {{{2 " Reformat everything {{{2
map <Leader>gq gggqG noremap <Leader>gq gggqG
" Reformat paragraph {{{2 " Reformat paragraph {{{2
map <Leader>gp gqap noremap <Leader>gp gqap
" Clear lines {{{2 " Clear lines {{{2
"map <Leader>clr :s/^.*$//<CR>:nohls<CR> "noremap <Leader>clr :s/^.*$//<CR>:nohls<CR>
" Delete blank lines {{{2 " Delete blank lines {{{2
map <Leader>dbl :g/^$/d<CR>:nohls<CR> noremap <Leader>dbl :g/^$/d<CR>:nohls<CR>
" Enclose each selected line with markers {{{2 " Enclose each selected line with markers {{{2
map <Leader>enc :<C-w>execute noremap <Leader>enc :<C-w>execute
\ substitute(":'<,'>s/^.*/#&#/ \| :nohls", "#", input(">"), "g")<CR> \ substitute(":'<,'>s/^.*/#&#/ \| :nohls", "#", input(">"), "g")<CR>
" Edit something in the current directory {{{2 " Edit something in the current directory {{{2
map <Leader>ed :e <C-r>=expand("%:p:h")<CR>/<C-d> noremap <Leader>ed :e <C-r>=expand("%:p:h")<CR>/<C-d>
" Enable fancy % matching {{{2 " Enable fancy % matching {{{2
if has("eval") if has("eval")
@ -758,7 +758,7 @@ if has("eval")
norm o norm o
call setline(line("."), "#endif") call setline(line("."), "#endif")
endfun endfun
map <Leader>ig :call MakeIncludeGuards()<CR> noremap <Leader>ig :call MakeIncludeGuards()<CR>
endif endif
" javascript folding {{{2 " javascript folding {{{2
@ -841,12 +841,12 @@ if v:version >= 700 && has("eval")
endif endif
endfun endfun
map <Leader>sh :call SwitchHeader(0)<CR> noremap <Leader>sh :call SwitchHeader(0)<CR>
map <Leader>st :call SwitchTest(0)<CR> noremap <Leader>st :call SwitchTest(0)<CR>
map <Leader>sk :call SwitchMakefile(0)<CR> noremap <Leader>sk :call SwitchMakefile(0)<CR>
map <Leader>ssh :call SwitchHeader(1)<CR> noremap <Leader>ssh :call SwitchHeader(1)<CR>
map <Leader>sst :call SwitchTest(1)<CR> noremap <Leader>sst :call SwitchTest(1)<CR>
map <Leader>ssk :call SwitchMakefile(1)<CR> noremap <Leader>ssk :call SwitchMakefile(1)<CR>
endif endif
" super i_c-y / i_c-e {{{2 " super i_c-y / i_c-e {{{2
@ -898,8 +898,8 @@ if v:version >= 700 && has("eval")
endif endif
endfun endfun
imap <C-g>y <C-\><C-o>:call SuperYank(-1)<CR> inoremap <C-g>y <C-\><C-o>:call SuperYank(-1)<CR>
imap <C-g>e <C-\><C-o>:call SuperYank(1)<CR> inoremap <C-g>e <C-\><C-o>:call SuperYank(1)<CR>
endif endif
" tab completion {{{2 " tab completion {{{2
@ -911,8 +911,8 @@ if has("eval")
return "\<C-N>" return "\<C-N>"
endif endif
endfun endfun
imap <Tab> <C-R>=CleverTab()<CR> inoremap <Tab> <C-R>=CleverTab()<CR>
imap <S-Tab> <C-P> inoremap <S-Tab> <C-P>
endif endif
" ^n Show number and fold columns in windows {{{2 " ^n Show number and fold columns in windows {{{2
@ -939,7 +939,7 @@ if has("eval")
endif endif
endfun endfun
"autocmd WinEnter,BufWinEnter,BufNew * :call <SID>FoldNumbers() "autocmd WinEnter,BufWinEnter,BufNew * :call <SID>FoldNumbers()
map <silent> <C-n> :call <SID>FoldNumbers()<CR> noremap <silent> <C-n> :call <SID>FoldNumbers()<CR>
endif endif
" }}}1 " }}}1
@ -1046,7 +1046,7 @@ if has("eval")
let Tlist_Exit_OnlyWindow=1 let Tlist_Exit_OnlyWindow=1
let Tlist_File_Fold_Auto_Close=1 let Tlist_File_Fold_Auto_Close=1
let Tlist_Inc_Winwidth=0 let Tlist_Inc_Winwidth=0
"nmap <silent> <F9> :Tlist<CR> "nnoremap <silent> <F9> :Tlist<CR>
" Settings minibufexpl.vim " Settings minibufexpl.vim
"let g:miniBufExplModSelTarget = 1 "let g:miniBufExplModSelTarget = 1
@ -1110,8 +1110,8 @@ if has("eval")
exec "nmap <C-j><C-j>" . y . " :scscope find " . y . exec "nmap <C-j><C-j>" . y . " :scscope find " . y .
\ " <C-R>=expand(\"\<cword\>\")<CR><CR>" \ " <C-R>=expand(\"\<cword\>\")<CR><CR>"
endwhile endwhile
nmap <C-j>i :cscope find i ^<C-R>=expand("<cword>")<CR><CR> nnoremap <C-j>i :cscope find i ^<C-R>=expand("<cword>")<CR><CR>
nmap <C-j><C-j>i :scscope find i ^<C-R>=expand("<cword>")<CR><CR> nnoremap <C-j><C-j>i :scscope find i ^<C-R>=expand("<cword>")<CR><CR>
endif endif
endif endif
@ -1210,40 +1210,40 @@ map <S-F2> :vsplit ~/.vim/ref_full.vim<CR>
map <F2> :11vsplit ~/.vim/ref.vim<CR> map <F2> :11vsplit ~/.vim/ref.vim<CR>
"map <F3> :Sexplore $HOME<CR> "map <F3> :Sexplore $HOME<CR>
map <S-F3> :2split ~/.vim/fun_ref.vim<CR> map <S-F3> :2split ~/.vim/fun_ref.vim<CR>
map <F4> :set rnu!<CR> noremap <F4> :set rnu!<CR>
map <S-F4> :set nu!<CR> noremap <S-F4> :set nu!<CR>
map <F5> ggVGg? noremap <F5> ggVGg?
map <F6> :set encoding=utf-8<CR>:set fenc=utf-8<CR> noremap <F6> :set encoding=utf-8<CR>:set fenc=utf-8<CR>
map <S-F6> :set encoding=iso8859-15<CR>:set fenc=iso8859-15<CR> noremap <S-F6> :set encoding=iso8859-15<CR>:set fenc=iso8859-15<CR>
"map <F7> :SpellProposeAlternatives<CR> "map <F7> :SpellProposeAlternatives<CR>
"map <S-F7> :SpellCheck<CR> "map <S-F7> :SpellCheck<CR>
"map <C-F7> :let spell_language_list = "english,spanish" "map <C-F7> :let spell_language_list = "english,spanish"
"nmap <silent> <F8> :Tlist<CR> "nnoremap <silent> <F8> :Tlist<CR>
"nmap <silent> <S-F8> :TlistSync<CR> "nnoremap <silent> <S-F8> :TlistSync<CR>
nmap <Esc> :noh<CR> nnoremap <Esc> :noh<CR><Esc>
map <F11> !!date<CR> map <F11> !!date<CR>
map <F12> :TC<CR> map <F12> :TC<CR>
nmap :X :x nnoremap :X :x
nmap :W :w nnoremap :W :w
nmap :Q :q nnoremap :Q :q
nmap :B :b nnoremap :B :b
map <Leader>rg :color relaxedgreen<CR> noremap <Leader>rg :color relaxedgreen<CR>
map <Leader>ip :color inkpot<CR> noremap <Leader>ip :color inkpot<CR>
map <Leader>ir :color ir_black<CR> noremap <Leader>ir :color ir_black<CR>
map <Leader>mv :color macvim<CR>:set background=light<CR> noremap <Leader>mv :color macvim<CR>:set background=light<CR>
map <Leader>f :FufFileWithCurrentBufferDir<CR> noremap <Leader>f :FufFileWithCurrentBufferDir<CR>
map <Leader>F :FufFile<CR> noremap <Leader>F :FufFile<CR>
map <Leader>v :FufCoverageFile<CR> noremap <Leader>v :FufCoverageFile<CR>
map <Leader>b :FufBuffer<CR> noremap <Leader>b :FufBuffer<CR>
map <Leader>c :FufDirWithFullCwd<CR> noremap <Leader>c :FufDirWithFullCwd<CR>
map <Leader>w :bdelete<CR> noremap <Leader>w :bdelete<CR>
map <F1> :FufHelp<CR> noremap <F1> :FufHelp<CR>
map <F12> <Esc>:syntax sync fromstart<CR> noremap <F12> <Esc>:syntax sync fromstart<CR>
imap <F12> <C-o>:syntax sync fromstart<CR> inoremap <F12> <C-o>:syntax sync fromstart<CR>
syntax sync minlines=200 syntax sync minlines=200
" NERD tree. Yay! " NERD tree. Yay!
nmap <silent> <C-G> :NERDTreeToggle<CR> nnoremap <silent> <C-G> :NERDTreeToggle<CR>
" Javac " Javac
"set makeprg=javac\ % "set makeprg=javac\ %