diff --git a/vim/colors/darkcloud.vim b/vim/colors/darkcloud.vim index d83f83d..da24a77 100644 --- a/vim/colors/darkcloud.vim +++ b/vim/colors/darkcloud.vim @@ -364,6 +364,9 @@ call s:X("DiffText","#000000","#c6c6c6","italic",s:termBlack,"White") call s:X("SignifySignAdd","#ffd787","","bold","","Yellow") call s:X("SignifySignDelete","#d75f5f","","bold","","Red") call s:X("SignifySignChange","#87d7ff","","bold","","Blue") +hi! link SignifyLineAdd DiffAdd +hi! link SignifyLineDelete DiffDelete +hi! link SignifyLineChange DiffChange hi! link gitconfigAssignment Label "html diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 514df1c..9870d3c 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -63,6 +63,7 @@ " | (A) -> toggle spell check " | (A) -> toggle syntax checking " | (A) -> toggle version control differences +" | (A) -> toggle version control difference line highlight " | (A) -> toggle the tagbar sidebar " | (A) -> toggle the location list to check syntax errors " | (A) -> toggle the gundo undo history sidebar @@ -162,8 +163,9 @@ " Filetype Specific Mappings: " (vimdiff) " <> | (N) -> update differences +" >< | (N) -> update differences " > | (N) -> replace diff in other pane with current pane -" < | (N) -> replace diff in current pane with other pane +" replace diff in current pane with other pane " " (help) " q | (N) -> close the dialog @@ -251,27 +253,27 @@ nnoremap za "unmap F1 from help then map it to toggle the display of line numbers - nnoremap ':set number!:echo "Line numbers toggled"' + nnoremap ':set number!:echo "line numbers toggled"' xnoremap ':set number!v' inoremap ':set number!' "toggle the cursor line and column - nnoremap ':set cursorline! cursorcolumn!:echo "Cursor crosshair toggled"' + nnoremap ':set cursorline! cursorcolumn!:echo "cursor crosshair toggled"' xnoremap ':set cursorline! cursorcolumn!v' inoremap ':set cursorline! cursorcolumn!' "toggle line wrapping (and bottom bar if using the gui) - nnoremap ':echo "Line wrapping toggled":set wrap!' + nnoremap ':echo "line wrapping toggled":set wrap!' xnoremap ':set wrap!v' inoremap ':set wrap!' "toggle all folds - nnoremap zi:echo "Code Folding Toggled" + nnoremap zi:echo "code folding toggled" xnoremap ziv inoremap zi "toggle spellcheck - nnoremap ':set spell!:echo "Spell checking toggled"' + nnoremap ':set spell!:echo "spell checking toggled"' xnoremap ':set spell!v' inoremap ':set spell!' @@ -280,19 +282,22 @@ xnoremap ':SyntasticToggleModev' inoremap ':SyntasticToggleMode' - "toggle signify + "toggle signify and signify highlight let g:signify_mapping_toggle = '' + nnoremap ':SignifyToggleHighlight:echo "toggled version control differences line highlight"' + xnoremap ':SignifyToggleHighlightv' + inoremap ':SignifyToggleHighlight' "bindings to trigger the tagbar list of tags - nnoremap ':TagbarToggle:echo "Code tagbar toggled"' + nnoremap ':TagbarToggle:echo "code tagbar toggled"' xnoremap ':TagbarTogglev' inoremap ':TagbarToggle' "bindings to trigger the tagbar list of errors - nmap