diff options
| author | Hsieh Chin Fan <pham@topo.tw> | 2024-07-07 13:18:24 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <pham@topo.tw> | 2024-07-07 13:18:24 +0800 |
| commit | 2c15b6b750c1fd95f5fd2a4ff0e959b78f81a648 (patch) | |
| tree | fa58cf5531e1b03849a8ee582ea4d7a094a484e5 /vim/init | |
| parent | 83291d488aa88346f79d15809c8c0dcf5ed271a1 (diff) | |
Update
Diffstat (limited to 'vim/init')
| -rw-r--r-- | vim/init/keymaps.vim | 19 |
1 files changed, 14 insertions, 5 deletions
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 | |||
| 266 | au BufLeave * let g:lastbuffer = bufnr() | 266 | au BufLeave * let g:lastbuffer = bufnr() |
| 267 | augroup END | 267 | augroup END |
| 268 | 268 | ||
| 269 | " Uset <C-w>d to toggle Diff mode | ||
| 269 | function! s:SwitchDiff() | 270 | function! s:SwitchDiff() |
| 270 | if &diff | 271 | if &diff |
| 271 | windo | if &buftype == "nofile" | bdelete | endif | 272 | windo | if &buftype == "nofile" | bdelete | endif |
| @@ -277,6 +278,19 @@ endfunction | |||
| 277 | com! SwitchDiff call s:SwitchDiff() | 278 | com! SwitchDiff call s:SwitchDiff() |
| 278 | nnoremap <C-w>d <Cmd>silent! SwitchDiff<CR> | 279 | nnoremap <C-w>d <Cmd>silent! SwitchDiff<CR> |
| 279 | 280 | ||
| 281 | function! s:SwitchDiffForGitHEAD() | ||
| 282 | nmap cdg | ||
| 283 | if &diff | ||
| 284 | windo | if &buftype == "nofile" | bdelete | endif | ||
| 285 | else | ||
| 286 | vert new | set buftype=nofile nobuflisted | ||
| 287 | read !git show HEAD:# | ||
| 288 | 0d_ | diffthis | wincmd p | diffthis | ||
| 289 | endif | ||
| 290 | endfunction | ||
| 291 | com! SwitchDiffForGitHEAD call s:SwitchDiffForGitHEAD() | ||
| 292 | nnoremap <C-w>D <Cmd>silent! SwitchDiffForGitHEAD<CR> | ||
| 293 | |||
| 280 | 294 | ||
| 281 | "---------------------------------------------------------------------- | 295 | "---------------------------------------------------------------------- |
| 282 | " MANAGE_WINDOWS | 296 | " MANAGE_WINDOWS |
| @@ -551,8 +565,3 @@ else | |||
| 551 | \ --include='*.js' --include='*.vim' | 565 | \ --include='*.js' --include='*.vim' |
| 552 | \ '<root>' <CR> | 566 | \ '<root>' <CR> |
| 553 | endif | 567 | endif |
| 554 | |||
| 555 | hi DiffAdd ctermfg=Green ctermbg=NONE | ||
| 556 | hi DiffChange ctermfg=Yellow ctermbg=NONE | ||
| 557 | hi DiffDelete ctermfg=LightBlue ctermbg=None | ||
| 558 | hi DiffText ctermfg=Yellow ctermbg=None | ||