From 2c15b6b750c1fd95f5fd2a4ff0e959b78f81a648 Mon Sep 17 00:00:00 2001 From: Hsieh Chin Fan Date: Sun, 7 Jul 2024 13:18:24 +0800 Subject: Update --- vim/init/keymaps.vim | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'vim/init') diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim index 67cf1d0..7be91b5 100644 --- a/vim/init/keymaps.vim +++ b/vim/init/keymaps.vim @@ -266,6 +266,7 @@ augroup SaveLastBuffer au BufLeave * let g:lastbuffer = bufnr() augroup END +" Uset d to toggle Diff mode function! s:SwitchDiff() if &diff windo | if &buftype == "nofile" | bdelete | endif @@ -277,6 +278,19 @@ endfunction com! SwitchDiff call s:SwitchDiff() nnoremap d silent! SwitchDiff +function! s:SwitchDiffForGitHEAD() + nmap cdg + if &diff + windo | if &buftype == "nofile" | bdelete | endif + else + vert new | set buftype=nofile nobuflisted + read !git show HEAD:# + 0d_ | diffthis | wincmd p | diffthis + endif +endfunction +com! SwitchDiffForGitHEAD call s:SwitchDiffForGitHEAD() +nnoremap D silent! SwitchDiffForGitHEAD + "---------------------------------------------------------------------- " MANAGE_WINDOWS @@ -551,8 +565,3 @@ else \ --include='*.js' --include='*.vim' \ '' endif - -hi DiffAdd ctermfg=Green ctermbg=NONE -hi DiffChange ctermfg=Yellow ctermbg=NONE -hi DiffDelete ctermfg=LightBlue ctermbg=None -hi DiffText ctermfg=Yellow ctermbg=None -- cgit v1.2.3-70-g09d2