aboutsummaryrefslogtreecommitdiffhomepage
path: root/vim/init/keymaps.vim
diff options
context:
space:
mode:
Diffstat (limited to 'vim/init/keymaps.vim')
-rw-r--r--vim/init/keymaps.vim8
1 files changed, 6 insertions, 2 deletions
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 7be91b5..3360a53 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -35,6 +35,9 @@ noremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
35" Search for selected test 35" Search for selected test
36vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR> 36vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
37 37
38" set buflisted
39noremap <leader>st :set<space>
40
38" Disable highlight when <leader><CR> is pressed 41" Disable highlight when <leader><CR> is pressed
39map <silent> <leader><CR> :noh<CR> 42map <silent> <leader><CR> :noh<CR>
40 43
@@ -64,9 +67,10 @@ command! W execute 'w !sudo -S tee %' <bar> edit!
64" Enter to open file 67" Enter to open file
65nnoremap <CR> gf 68nnoremap <CR> gf
66nnoremap gF :e <cfile><CR> 69nnoremap gF :e <cfile><CR>
70
71" Remap <CR> in Quickfix, Cmdwin Location list
67augroup vimrc_CRfix 72augroup vimrc_CRfix
68 au! 73 au!
69 " Quickfix, Location list, &c. remap <CR> to work as expected
70 autocmd BufReadPost quickfix nnoremap <buffer> <CR> <CR> 74 autocmd BufReadPost quickfix nnoremap <buffer> <CR> <CR>
71 autocmd CmdwinEnter * nnoremap <buffer> <CR> <CR> 75 autocmd CmdwinEnter * nnoremap <buffer> <CR> <CR>
72 autocmd CmdwinEnter * nnoremap <buffer> <C-c> <C-c> 76 autocmd CmdwinEnter * nnoremap <buffer> <C-c> <C-c>
@@ -283,7 +287,7 @@ function! s:SwitchDiffForGitHEAD()
283 if &diff 287 if &diff
284 windo | if &buftype == "nofile" | bdelete | endif 288 windo | if &buftype == "nofile" | bdelete | endif
285 else 289 else
286 vert new | set buftype=nofile nobuflisted 290 vert new | set buftype=nofile nobuflisted
287 read !git show HEAD:# 291 read !git show HEAD:#
288 0d_ | diffthis | wincmd p | diffthis 292 0d_ | diffthis | wincmd p | diffthis
289 endif 293 endif