From aca163580fe7aa70a918877be422c53b1be9a360 Mon Sep 17 00:00:00 2001 From: yan Date: Thu, 19 Jul 2012 12:46:19 -0700 Subject: [PATCH] Upgraded plugins --- vim/bundle/AndrewRadev-splitjoin | 2 +- vim/bundle/Shougo-neocomplcache | 2 +- vim/bundle/chrisbra-color_highlight | 2 +- vim/bundle/claco-jasmine | 2 +- vim/bundle/garbas-vim-snipmate | 2 +- vim/bundle/gregsexton-gitv | 2 +- vim/bundle/honza-snipmate-snippets | 2 +- vim/bundle/kien-ctrlp | 2 +- vim/bundle/majutsushi-tagbar | 2 +- vim/bundle/mattn-gist-vim | 2 +- vim/bundle/mattn-webapi-vim | 2 +- vim/bundle/mattn-zencoding-vim | 2 +- vim/bundle/nathanaelkane-vim-indent-guides | 2 +- vim/bundle/raimondi-delimitMate | 2 +- vim/bundle/scrooloose-nerdtree | 2 +- vim/bundle/scrooloose-syntastic | 2 +- vim/bundle/sjbach-lusty | 2 +- vim/bundle/tomtom-tcomment_vim | 2 +- vim/bundle/tomtom-tlib_vim | 2 +- vim/bundle/tpope-vim-fugitive | 2 +- vim/bundle/tpope-vim-git | 2 +- vim/bundle/tpope-vim-haml | 2 +- vim/bundle/tpope-vim-rails | 2 +- vim/bundle/tpope-vim-surround | 2 +- vim/bundle/vim-ruby-vim-ruby | 2 +- vim/bundle/vim-scripts-ZoomWin | 2 +- vim/plugin/settings/yankring.vim | 4 ++++ zsh/zsh-syntax-highlighting | 2 +- 28 files changed, 31 insertions(+), 27 deletions(-) diff --git a/vim/bundle/AndrewRadev-splitjoin b/vim/bundle/AndrewRadev-splitjoin index c456bec..e23e41f 160000 --- a/vim/bundle/AndrewRadev-splitjoin +++ b/vim/bundle/AndrewRadev-splitjoin @@ -1 +1 @@ -Subproject commit c456bec3e30f943f7cfeebbe00fd8709cd604849 +Subproject commit e23e41fc7566f74155c8e678ffe70dc0deecaee9 diff --git a/vim/bundle/Shougo-neocomplcache b/vim/bundle/Shougo-neocomplcache index 86c2eae..313c904 160000 --- a/vim/bundle/Shougo-neocomplcache +++ b/vim/bundle/Shougo-neocomplcache @@ -1 +1 @@ -Subproject commit 86c2eaeaf612740819369da9210ecbc0b9ba88fa +Subproject commit 313c90476639de9100f7274192c0af0d2ee9e35c diff --git a/vim/bundle/chrisbra-color_highlight b/vim/bundle/chrisbra-color_highlight index 9f962d0..636701f 160000 --- a/vim/bundle/chrisbra-color_highlight +++ b/vim/bundle/chrisbra-color_highlight @@ -1 +1 @@ -Subproject commit 9f962d0e02ee38bccae17e8fa7ccbf2d4aeab30f +Subproject commit 636701fd981aa0dfc886ec7dc4c4cd7a4b9bca05 diff --git a/vim/bundle/claco-jasmine b/vim/bundle/claco-jasmine index 9e389d6..4dcb937 160000 --- a/vim/bundle/claco-jasmine +++ b/vim/bundle/claco-jasmine @@ -1 +1 @@ -Subproject commit 9e389d6159515d2eaf617b658bf38cb0a59c144e +Subproject commit 4dcb93771d9284fa4f2f0419afd78d88dd614cc7 diff --git a/vim/bundle/garbas-vim-snipmate b/vim/bundle/garbas-vim-snipmate index 3f52de4..41152a2 160000 --- a/vim/bundle/garbas-vim-snipmate +++ b/vim/bundle/garbas-vim-snipmate @@ -1 +1 @@ -Subproject commit 3f52de449280badc57c0d41014e64d051166e741 +Subproject commit 41152a2c46d131eadb469a8432a92c487895dd62 diff --git a/vim/bundle/gregsexton-gitv b/vim/bundle/gregsexton-gitv index a50dc10..c39aa33 160000 --- a/vim/bundle/gregsexton-gitv +++ b/vim/bundle/gregsexton-gitv @@ -1 +1 @@ -Subproject commit a50dc10b6dc6b8bae43095fddc4826866585d7ea +Subproject commit c39aa338870ebecaa82b8056049baa99a311354a diff --git a/vim/bundle/honza-snipmate-snippets b/vim/bundle/honza-snipmate-snippets index ce0037f..a558a97 160000 --- a/vim/bundle/honza-snipmate-snippets +++ b/vim/bundle/honza-snipmate-snippets @@ -1 +1 @@ -Subproject commit ce0037f583b10e898a983dcbe4642acbbef24963 +Subproject commit a558a9787b280295cb17d264487178b1d5c5f2ec diff --git a/vim/bundle/kien-ctrlp b/vim/bundle/kien-ctrlp index 96bd4b3..9102e75 160000 --- a/vim/bundle/kien-ctrlp +++ b/vim/bundle/kien-ctrlp @@ -1 +1 @@ -Subproject commit 96bd4b37f4459f30cc6963142aff6697e42bf69e +Subproject commit 9102e75bf6efa135a16e433cadb422c5a0b76a6a diff --git a/vim/bundle/majutsushi-tagbar b/vim/bundle/majutsushi-tagbar index ee1c4e1..6a7f155 160000 --- a/vim/bundle/majutsushi-tagbar +++ b/vim/bundle/majutsushi-tagbar @@ -1 +1 @@ -Subproject commit ee1c4e137e33c64c787df68efcca7e9af4c5f790 +Subproject commit 6a7f155874bfcb698ec3a08761165da98335b02c diff --git a/vim/bundle/mattn-gist-vim b/vim/bundle/mattn-gist-vim index 5954a99..aad7fb3 160000 --- a/vim/bundle/mattn-gist-vim +++ b/vim/bundle/mattn-gist-vim @@ -1 +1 @@ -Subproject commit 5954a994fba2ce75c92d9d211487534c2a525824 +Subproject commit aad7fb31849c548ec21fcb018e2bf49629f4f290 diff --git a/vim/bundle/mattn-webapi-vim b/vim/bundle/mattn-webapi-vim index d18dc67..b847cd0 160000 --- a/vim/bundle/mattn-webapi-vim +++ b/vim/bundle/mattn-webapi-vim @@ -1 +1 @@ -Subproject commit d18dc67d6d4747f084848280a7b44f0ed51a2f48 +Subproject commit b847cd04cc83bbf27e0939928001ccd749efc2a5 diff --git a/vim/bundle/mattn-zencoding-vim b/vim/bundle/mattn-zencoding-vim index 19f984b..267b428 160000 --- a/vim/bundle/mattn-zencoding-vim +++ b/vim/bundle/mattn-zencoding-vim @@ -1 +1 @@ -Subproject commit 19f984b1655656b2a52d1edee22a5870136d6ae5 +Subproject commit 267b428943f7645ec6567c5298b25791a8b79d7f diff --git a/vim/bundle/nathanaelkane-vim-indent-guides b/vim/bundle/nathanaelkane-vim-indent-guides index 6630674..5bc809d 160000 --- a/vim/bundle/nathanaelkane-vim-indent-guides +++ b/vim/bundle/nathanaelkane-vim-indent-guides @@ -1 +1 @@ -Subproject commit 66306748d8960945342d04d41fe6131a00bbf7cb +Subproject commit 5bc809d0558d7086075ef8ff1d05dec0f403b2c1 diff --git a/vim/bundle/raimondi-delimitMate b/vim/bundle/raimondi-delimitMate index 9c1564a..1dfe26a 160000 --- a/vim/bundle/raimondi-delimitMate +++ b/vim/bundle/raimondi-delimitMate @@ -1 +1 @@ -Subproject commit 9c1564a22f19867c6ce6781ae72da785795b1e84 +Subproject commit 1dfe26a5385de33cd7d9a0175c4fa89defd88386 diff --git a/vim/bundle/scrooloose-nerdtree b/vim/bundle/scrooloose-nerdtree index 2cb0fc7..a1433c4 160000 --- a/vim/bundle/scrooloose-nerdtree +++ b/vim/bundle/scrooloose-nerdtree @@ -1 +1 @@ -Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d +Subproject commit a1433c485eb254838c1db52e087d5ec4d1e77cfd diff --git a/vim/bundle/scrooloose-syntastic b/vim/bundle/scrooloose-syntastic index ec9bf2e..6818c45 160000 --- a/vim/bundle/scrooloose-syntastic +++ b/vim/bundle/scrooloose-syntastic @@ -1 +1 @@ -Subproject commit ec9bf2e983463445b15e1df20c2d774e9bf7361b +Subproject commit 6818c45710b2e889c85ae9ca88ac1c1d2b5d2420 diff --git a/vim/bundle/sjbach-lusty b/vim/bundle/sjbach-lusty index c48ab27..3572b5d 160000 --- a/vim/bundle/sjbach-lusty +++ b/vim/bundle/sjbach-lusty @@ -1 +1 @@ -Subproject commit c48ab27cba4390cda2f50a8d2d1af7c3fd3a5442 +Subproject commit 3572b5d9546621327396310000c7c8b4151a13d1 diff --git a/vim/bundle/tomtom-tcomment_vim b/vim/bundle/tomtom-tcomment_vim index ec0ae34..4d55a4b 160000 --- a/vim/bundle/tomtom-tcomment_vim +++ b/vim/bundle/tomtom-tcomment_vim @@ -1 +1 @@ -Subproject commit ec0ae34e981627e05f6441c77b4e0aa3e8cc99ff +Subproject commit 4d55a4b55666a5846956655e1a1ca30004702b06 diff --git a/vim/bundle/tomtom-tlib_vim b/vim/bundle/tomtom-tlib_vim index 4d2b437..70da974 160000 --- a/vim/bundle/tomtom-tlib_vim +++ b/vim/bundle/tomtom-tlib_vim @@ -1 +1 @@ -Subproject commit 4d2b437055c56cabc65a19044659bc01ff86870b +Subproject commit 70da9742b147a4a5ed77217a4604f23ec4736898 diff --git a/vim/bundle/tpope-vim-fugitive b/vim/bundle/tpope-vim-fugitive index 1eb4a9f..745ccf5 160000 --- a/vim/bundle/tpope-vim-fugitive +++ b/vim/bundle/tpope-vim-fugitive @@ -1 +1 @@ -Subproject commit 1eb4a9f7e32d0da674fbd58c6993f2d27bcecee3 +Subproject commit 745ccf50662fc18c11e0c7a397b59e07a5a13141 diff --git a/vim/bundle/tpope-vim-git b/vim/bundle/tpope-vim-git index 3d31cb0..2d54fb2 160000 --- a/vim/bundle/tpope-vim-git +++ b/vim/bundle/tpope-vim-git @@ -1 +1 @@ -Subproject commit 3d31cb0cc9470d57adf36cc3224814ccb0293cc9 +Subproject commit 2d54fb2b87fe3b74c2fb00edcfaa1f711944e6ea diff --git a/vim/bundle/tpope-vim-haml b/vim/bundle/tpope-vim-haml index 6284c18..9a891ed 160000 --- a/vim/bundle/tpope-vim-haml +++ b/vim/bundle/tpope-vim-haml @@ -1 +1 @@ -Subproject commit 6284c188c23fabc6feb7d177bd8a0d06e6af1e0f +Subproject commit 9a891ed78a4b222e8c710e533e0d1f21259c0ef1 diff --git a/vim/bundle/tpope-vim-rails b/vim/bundle/tpope-vim-rails index 8412c9b..f546d5c 160000 --- a/vim/bundle/tpope-vim-rails +++ b/vim/bundle/tpope-vim-rails @@ -1 +1 @@ -Subproject commit 8412c9b9fef6225696be6c4a97e58a7eb1bbbf1a +Subproject commit f546d5cd3983c3d67c8df278f7cbf2e01974cca4 diff --git a/vim/bundle/tpope-vim-surround b/vim/bundle/tpope-vim-surround index 489a1e8..1a73f60 160000 --- a/vim/bundle/tpope-vim-surround +++ b/vim/bundle/tpope-vim-surround @@ -1 +1 @@ -Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b +Subproject commit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 diff --git a/vim/bundle/vim-ruby-vim-ruby b/vim/bundle/vim-ruby-vim-ruby index e7e6b4e..a9073e5 160000 --- a/vim/bundle/vim-ruby-vim-ruby +++ b/vim/bundle/vim-ruby-vim-ruby @@ -1 +1 @@ -Subproject commit e7e6b4e8d92938b461f20cb94bdca7f79aed2447 +Subproject commit a9073e55084c391f6322b3bcde9d1a5bd561627e diff --git a/vim/bundle/vim-scripts-ZoomWin b/vim/bundle/vim-scripts-ZoomWin index e7ee18e..cf21ce1 160000 --- a/vim/bundle/vim-scripts-ZoomWin +++ b/vim/bundle/vim-scripts-ZoomWin @@ -1 +1 @@ -Subproject commit e7ee18e2e7ed60509aa951cd34b57193fa14e5ab +Subproject commit cf21ce1f4bfec10fe7e446c08e9e647a2a234e03 diff --git a/vim/plugin/settings/yankring.vim b/vim/plugin/settings/yankring.vim index 409ffc6..1cf07ac 100644 --- a/vim/plugin/settings/yankring.vim +++ b/vim/plugin/settings/yankring.vim @@ -1,2 +1,6 @@ let g:yankring_history_file = '.yankring-history' nnoremap ,yr :YRShow +nnoremap C-y :YRShow + +"bad yankring! leave my macro mapping alone. +unmap @ diff --git a/zsh/zsh-syntax-highlighting b/zsh/zsh-syntax-highlighting index bb0d575..732b7d6 160000 --- a/zsh/zsh-syntax-highlighting +++ b/zsh/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit bb0d575942760fe483790fe878ea43b1f781e2ca +Subproject commit 732b7d6e65c0349ee1d89b698bf9cd8a30c1015d