From 2c2dda260c4b4d21926c18d885fcc8c803897d25 Mon Sep 17 00:00:00 2001 From: Max Alcala Date: Mon, 23 May 2016 14:52:32 -0500 Subject: [PATCH] update closing chars, Yank Ring, consolidate trailing whitespace functions --- my_configs.vim | 6 ------ vimrcs/basic.vim | 7 +++---- vimrcs/extended.vim | 14 ++++++-------- vimrcs/plugins_config.vim | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/my_configs.vim b/my_configs.vim index d99fc054..007d9578 100644 --- a/my_configs.vim +++ b/my_configs.vim @@ -19,9 +19,3 @@ let g:syntastic_javascript_args = "-c ./.eslintrc" map wc c map wn n - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Autotrim trailing spaces on specific files -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -autocmd FileType javascript autocmd BufWritePre :%s/\s\+$//e - diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index 70b74039..89fe472b 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -308,6 +308,8 @@ endfunc autocmd BufWrite *.py :call DeleteTrailingWS() autocmd BufWrite *.coffee :call DeleteTrailingWS() autocmd BufWrite *.rb :call DeleteTrailingWS() +autocmd BufWrite *.js :call DeleteTrailingWS() +autocmd BufWrite *.es6 :call DeleteTrailingWS() """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -337,7 +339,7 @@ vnoremap r :call VisualSelection('replace', '') map cc :botright cope map co ggVGy:tabnew:set syntax=qfpgg map n :cn -map p :cp +map p :YRShow """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -368,9 +370,6 @@ map x :e ~/buffer.md " Toggle paste mode on and off map pp :setlocal paste! - - - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Helper functions """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim index 255a31cf..172ae2af 100644 --- a/vimrcs/extended.vim +++ b/vimrcs/extended.vim @@ -97,14 +97,12 @@ vnoremap $q `>a'` vnoremap $e `>a"` " Map auto complete of (, ", ', [ -inoremap $1 ()i -inoremap $2 []i -inoremap $3 {}i -inoremap $4 {o}O -inoremap $q ''i -inoremap $e ""i -inoremap $t <>i - +inoremap ( ()i +inoremap [ []i +inoremap { {}i +inoremap { {o}O +inoremap ' ''i +inoremap " ""i """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => General abbreviations diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim index 056f80ec..45ef99a9 100644 --- a/vimrcs/plugins_config.vim +++ b/vimrcs/plugins_config.vim @@ -167,5 +167,5 @@ autocmd FileType javascript :call SyntasticESlintChecker() """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => Git gutter (Git diff) """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:gitgutter_enabled=0 +let g:gitgutter_enabled=1 nnoremap d :GitGutterToggle