From 9931e0888b2419326ae10ebbfae532261c5c125f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 30 Jun 2016 16:11:56 +0200 Subject: Fix submodules --- vim/bundle/vim-gitgutter | 1 + vim/bundle/vim-gitgutter/plugin/gitgutter.vim | 224 -------------------------- 2 files changed, 1 insertion(+), 224 deletions(-) create mode 160000 vim/bundle/vim-gitgutter delete mode 100644 vim/bundle/vim-gitgutter/plugin/gitgutter.vim (limited to 'vim/bundle/vim-gitgutter/plugin') diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter new file mode 160000 index 0000000..b5f23e9 --- /dev/null +++ b/vim/bundle/vim-gitgutter @@ -0,0 +1 @@ +Subproject commit b5f23e986747a6f4b1dc1196d2a5bd3dc7c8c2b6 diff --git a/vim/bundle/vim-gitgutter/plugin/gitgutter.vim b/vim/bundle/vim-gitgutter/plugin/gitgutter.vim deleted file mode 100644 index ff87a0a..0000000 --- a/vim/bundle/vim-gitgutter/plugin/gitgutter.vim +++ /dev/null @@ -1,224 +0,0 @@ -scriptencoding utf-8 - -if exists('g:loaded_gitgutter') || !has('signs') || &cp - finish -endif -let g:loaded_gitgutter = 1 - -" Initialisation {{{ - -" Realtime sign updates require Vim 7.3.105+. -if v:version < 703 || (v:version == 703 && !has("patch105")) - let g:gitgutter_realtime = 0 -endif - -" Eager updates require gettabvar()/settabvar(). -if !exists("*gettabvar") - let g:gitgutter_eager = 0 -endif - -function! s:set(var, default) abort - if !exists(a:var) - if type(a:default) - execute 'let' a:var '=' string(a:default) - else - execute 'let' a:var '=' a:default - endif - endif -endfunction - -call s:set('g:gitgutter_enabled', 1) -call s:set('g:gitgutter_max_signs', 500) -call s:set('g:gitgutter_signs', 1) -call s:set('g:gitgutter_highlight_lines', 0) -call s:set('g:gitgutter_sign_column_always', 0) -call s:set('g:gitgutter_override_sign_column_highlight', 1) -call s:set('g:gitgutter_realtime', 1) -call s:set('g:gitgutter_eager', 1) -call s:set('g:gitgutter_sign_added', '+') -call s:set('g:gitgutter_sign_modified', '~') -call s:set('g:gitgutter_sign_removed', '_') -try - call s:set('g:gitgutter_sign_removed_first_line', '‾') -catch /E239/ - let g:gitgutter_sign_removed_first_line = '_^' -endtry - -call s:set('g:gitgutter_sign_modified_removed', '~_') -call s:set('g:gitgutter_diff_args', '') -call s:set('g:gitgutter_diff_base', '') -call s:set('g:gitgutter_map_keys', 1) -call s:set('g:gitgutter_avoid_cmd_prompt_on_windows', 1) -call s:set('g:gitgutter_async', 1) -call s:set('g:gitgutter_log', 0) -call s:set('g:gitgutter_git_executable', 'git') - -if !executable(g:gitgutter_git_executable) - call gitgutter#utility#warn('cannot find git. Please set g:gitgutter_git_executable.') -endif - -call gitgutter#highlight#define_sign_column_highlight() -call gitgutter#highlight#define_highlights() -call gitgutter#highlight#define_signs() - -" }}} - -" Primary functions {{{ - -command -bar GitGutterAll call gitgutter#all() -command -bar GitGutter call gitgutter#process_buffer(bufnr(''), 0) - -command -bar GitGutterDisable call gitgutter#disable() -command -bar GitGutterEnable call gitgutter#enable() -command -bar GitGutterToggle call gitgutter#toggle() - -" }}} - -" Line highlights {{{ - -command -bar GitGutterLineHighlightsDisable call gitgutter#line_highlights_disable() -command -bar GitGutterLineHighlightsEnable call gitgutter#line_highlights_enable() -command -bar GitGutterLineHighlightsToggle call gitgutter#line_highlights_toggle() - -" }}} - -" Signs {{{ - -command -bar GitGutterSignsEnable call gitgutter#signs_enable() -command -bar GitGutterSignsDisable call gitgutter#signs_disable() -command -bar GitGutterSignsToggle call gitgutter#signs_toggle() - -" }}} - -" Hunks {{{ - -command -bar -count=1 GitGutterNextHunk call gitgutter#hunk#next_hunk() -command -bar -count=1 GitGutterPrevHunk call gitgutter#hunk#prev_hunk() - -command -bar GitGutterStageHunk call gitgutter#stage_hunk() -command -bar GitGutterUndoHunk call gitgutter#undo_hunk() -command -bar GitGutterRevertHunk echomsg 'GitGutterRevertHunk is deprecated. Use GitGutterUndoHunk'call gitgutter#undo_hunk() -command -bar GitGutterPreviewHunk call gitgutter#preview_hunk() - -" Hunk text object -onoremap GitGutterTextObjectInnerPending :call gitgutter#hunk#text_object(1) -onoremap GitGutterTextObjectOuterPending :call gitgutter#hunk#text_object(0) -xnoremap GitGutterTextObjectInnerVisual :call gitgutter#hunk#text_object(1) -xnoremap GitGutterTextObjectOuterVisual :call gitgutter#hunk#text_object(0) - - -" Returns the git-diff hunks for the file or an empty list if there -" aren't any hunks. -" -" The return value is a list of lists. There is one inner list per hunk. -" -" [ -" [from_line, from_count, to_line, to_count], -" [from_line, from_count, to_line, to_count], -" ... -" ] -" -" where: -" -" `from` - refers to the staged file -" `to` - refers to the working tree's file -" `line` - refers to the line number where the change starts -" `count` - refers to the number of lines the change covers -function! GitGutterGetHunks() - return gitgutter#utility#is_active() ? gitgutter#hunk#hunks() : [] -endfunction - -" Returns an array that contains a summary of the hunk status for the current -" window. The format is [ added, modified, removed ], where each value -" represents the number of lines added/modified/removed respectively. -function! GitGutterGetHunkSummary() - return gitgutter#hunk#summary(winbufnr(0)) -endfunction - -" }}} - -command -bar GitGutterDebug call gitgutter#debug#debug() - -" Maps {{{ - -nnoremap GitGutterNextHunk &diff ? ']c' : ":\execute v:count1 . 'GitGutterNextHunk'\" -nnoremap GitGutterPrevHunk &diff ? '[c' : ":\execute v:count1 . 'GitGutterPrevHunk'\" - -if g:gitgutter_map_keys - if !hasmapto('GitGutterPrevHunk') && maparg('[c', 'n') ==# '' - nmap [c GitGutterPrevHunk - endif - if !hasmapto('GitGutterNextHunk') && maparg(']c', 'n') ==# '' - nmap ]c GitGutterNextHunk - endif -endif - - -nnoremap GitGutterStageHunk :GitGutterStageHunk -nnoremap GitGutterUndoHunk :GitGutterUndoHunk -nnoremap GitGutterPreviewHunk :GitGutterPreviewHunk - -if g:gitgutter_map_keys - if !hasmapto('GitGutterStageHunk') && maparg('hs', 'n') ==# '' - nmap hs GitGutterStageHunk - endif - if !hasmapto('GitGutterUndoHunk') && maparg('hu', 'n') ==# '' - nmap hu GitGutterUndoHunk - nmap hr GitGutterUndoHunk:echomsg 'hr is deprecated. Use hu' - endif - if !hasmapto('GitGutterPreviewHunk') && maparg('hp', 'n') ==# '' - nmap hp GitGutterPreviewHunk - endif - - if !hasmapto('GitGutterTextObjectInnerPending') && maparg('ic', 'o') ==# '' - omap ic GitGutterTextObjectInnerPending - endif - if !hasmapto('GitGutterTextObjectOuterPending') && maparg('ac', 'o') ==# '' - omap ac GitGutterTextObjectOuterPending - endif - if !hasmapto('GitGutterTextObjectInnerVisual') && maparg('ic', 'x') ==# '' - xmap ic GitGutterTextObjectInnerVisual - endif - if !hasmapto('GitGutterTextObjectOuterVisual') && maparg('ac', 'x') ==# '' - xmap ac GitGutterTextObjectOuterVisual - endif -endif - -" }}} - -" Autocommands {{{ - -augroup gitgutter - autocmd! - - if g:gitgutter_realtime - autocmd CursorHold,CursorHoldI * call gitgutter#process_buffer(bufnr(''), 1) - endif - - if g:gitgutter_eager - autocmd BufEnter,BufWritePost,FileChangedShellPost * - \ if gettabvar(tabpagenr(), 'gitgutter_didtabenter') | - \ call settabvar(tabpagenr(), 'gitgutter_didtabenter', 0) | - \ else | - \ call gitgutter#process_buffer(bufnr(''), 0) | - \ endif - autocmd TabEnter * - \ call settabvar(tabpagenr(), 'gitgutter_didtabenter', 1) | - \ call gitgutter#all() - if !has('gui_win32') - autocmd FocusGained * call gitgutter#all() - endif - else - autocmd BufRead,BufWritePost,FileChangedShellPost * call gitgutter#process_buffer(bufnr(''), 0) - endif - - autocmd ColorScheme * call gitgutter#highlight#define_sign_column_highlight() | call gitgutter#highlight#define_highlights() - - " Disable during :vimgrep - autocmd QuickFixCmdPre *vimgrep* let g:gitgutter_enabled = 0 - autocmd QuickFixCmdPost *vimgrep* let g:gitgutter_enabled = 1 -augroup END - -" }}} - -" vim:set et sw=2 fdm=marker: -- cgit v1.2.3