removed gitgutter and changed its settings and theme to handle signify

instead
This commit is contained in:
Kevin 2014-04-07 12:05:52 -04:00
parent 48466b23f9
commit 4c5dd3f4a7
4 changed files with 21 additions and 16 deletions

@ -1 +0,0 @@
Subproject commit 47ffb2e30b27c58fe091862eebe044df65e5a7dc

View file

@ -360,12 +360,11 @@ call s:X("DiffDelete","#000000","#d75f5f","italic",s:termBlack,"Red")
call s:X("DiffChange","#000000","#87d7ff","italic",s:termBlack,"Blue")
call s:X("DiffText","#000000","#c6c6c6","italic",s:termBlack,"White")
"git
"version control
call s:X("SignifySignAdd","#ffd787","","bold","","Yellow")
call s:X("SignifySignDelete","#d75f5f","","bold","","Red")
call s:X("SignifySignChange","#87d7ff","","bold","","Blue")
hi! link gitconfigAssignment Label
call s:X("GitGutterAdd","#ffd787","","bold","","Yellow")
call s:X("GitGutterDelete","#d75f5f","","bold","","Red")
call s:X("GitGutterChange","#87d7ff","","bold","","Blue")
hi! link GitGutterChangeDelete GitGutterChange
"html
call s:X("htmlTitle","#ffffff","","underline,bold","White","")

View file

@ -62,6 +62,7 @@
" <F4> | (A) -> toggle all folds
" <F5> | (A) -> toggle spell check
" <F6> | (A) -> toggle syntax checking
" <F7> | (A) -> toggle version control differences
" <F8> | (A) -> toggle the tagbar sidebar
" <Ctrl-F8> | (A) -> toggle the location list to check syntax errors
" <F9> | (A) -> toggle the gundo undo history sidebar
@ -121,8 +122,8 @@
" <Alt+h> | (N) -> move a line up a half page
" <Alt+l> | (N) -> move a line down a half page
"
" >> | (N) -> next difference (vimdiff/gitgutter)
" << | (N) -> previous difference (vimdiff/gitgutter)
" >> | (N) -> next difference (vimdiff/signify)
" << | (N) -> previous difference (vimdiff/signify)
"
" (selection)
" <Ctrl-a> | (N) -> select all text
@ -279,6 +280,9 @@
xnoremap <silent><expr> <F6> '<Esc>:SyntasticToggleMode<CR>v'
inoremap <silent><expr> <F6> '<C-O>:SyntasticToggleMode<CR>'
"toggle signify
let g:signify_mapping_toggle = '<F7>'
"bindings to trigger the tagbar list of tags
nnoremap <silent><expr> <F8> ':TagbarToggle<CR>:echo "Code tagbar toggled"<CR>'
xnoremap <silent><expr> <F8> '<Esc>:TagbarToggle<CR>v'
@ -383,7 +387,11 @@
nmap <A-h> <Plug>MoveLineHalfPageUp
nmap <A-l> <Plug>MoveLineHalfPageDown
"move to next/previous difference (vimdiff/gitgutter)
"map signify to ]c and [c
let g:signify_mapping_next_hunk = ']c'
let g:signify_mapping_prev_hunk = '[c'
"move to next/previous difference (vimdiff/signify)
nmap >> ]c
nmap << [c
"}

View file

@ -16,7 +16,7 @@
let g:breeze_shade_color = "String"
"}}}
"EMMET: ZENCODING FEATURES {{{
"EMMET: {{{
let g:user_emmet_install_global=0
let g:use_emmet_complete_tag=1
let g:user_emmet_mode='a'
@ -28,12 +28,11 @@
endif
"}}}
"GITGUTTER: {{{
let g:gitgutter_sign_added='++'
let g:gitgutter_sign_removed='--'
let g:gitgutter_sign_modified='~~'
let g:gitgutter_sign_modified_removed='~-'
let g:gitgutter_escape_grep=1
"SIGNIFY: {{{
let g:signify_sign_add = '+'
let g:signify_sign_change = '!'
let g:signify_sign_delete = '-'
let g:signify_sign_delete_first_line = '~'
"}}}
"GUNDO: {{{