dotfiles

commit c123a6ee5aef6a0eb7016c6edb7b643793f6dd71
parent 0df590a390388d2d5fba36d08816734abcfb62e9
Author: Ed van Bruggen <edvb54@gmail.com>
Date:   Fri, 24 Oct 2014 16:32:31 -0700

Vim: Add VimBed plug-in

Diffstat:
vim/bundle/vim-rsi/doc/rsi.txt
 | 
7
+++++++
vim/bundle/vim-rsi/plugin/rsi.vim
 | 
8
++++++++
vim/bundle/vimbed
 | 
1
+
vimrc.bundles
 | 
2
++

4 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/vim/bundle/vim-rsi/doc/rsi.txt b/vim/bundle/vim-rsi/doc/rsi.txt
@@ -35,6 +35,9 @@ MAPS                                            *rsi-maps*
 <C-f>                   Move forward one character.  Falls back to
                         |i_CTRL-F| or |c_CTRL-F| at the end of the line.
 
+                                                *rsi-CTRL-G*
+<C-g>                   Return to normal mode from the |cmdline|.
+
                                                 *rsi-CTRL-T*
 <C-t>                   Transpose two characters.  This is mapped in command
                         line mode only, as |i_CTRL-T| is too important to
@@ -64,6 +67,10 @@ for a second if you actually press just escape.  Instead, rsi.vim makes
 these available by telling Vim they are existing special keys. For example,
 the key code for <S-Left> is changed to <Esc>b.
 
+To disable meta maps, add the following to your vimrc:
+>
+    let g:rsi_no_meta = 1
+<
 ABOUT                                           *rsi-about*
 
 Grab the latest version or report a bug on GitHub:
diff --git a/vim/bundle/vim-rsi/plugin/rsi.vim b/vim/bundle/vim-rsi/plugin/rsi.vim
@@ -29,10 +29,18 @@ inoremap <expr> <C-E> col('.')>strlen(getline('.'))?"\<Lt>C-E>":"\<Lt>End>"
 inoremap <expr> <C-F> col('.')>strlen(getline('.'))?"\<Lt>C-F>":"\<Lt>Right>"
 cnoremap <expr> <C-F> getcmdpos()>strlen(getcmdline())?&cedit:"\<Lt>Right>"
 
+if empty(mapcheck('<C-G>', 'c'))
+  cmap <script> <C-G> <C-C>
+endif
+
 noremap! <expr> <SID>transposition getcmdpos()>strlen(getcmdline())?"\<Left>":getcmdpos()>1?'':"\<Right>"
 noremap! <expr> <SID>transpose "\<BS>\<Right>".matchstr(getcmdline()[0 : getcmdpos()-2], '.$')
 cmap   <script> <C-T> <SID>transposition<SID>transpose
 
+if exists('g:rsi_no_meta')
+  finish
+endif
+
 if &encoding ==# 'latin1' && has('gui_running') && !empty(findfile('plugin/sensible.vim', escape(&rtp, ' ')))
   set encoding=utf-8
 endif
diff --git a/vim/bundle/vimbed b/vim/bundle/vimbed
@@ -0,0 +1 @@
+Subproject commit bdaa66147eda6717258b3a625c38a287e3a94625
diff --git a/vimrc.bundles b/vimrc.bundles
@@ -94,6 +94,8 @@ Bundle 'reedes/vim-pencil'
 Bundle 'junegunn/vim-easy-align'
 " use s and S to move through line
 Bundle 'jayflo/vim-skip'
+" some programs use this to embed vim
+Bundle 'ardagnir/vimbed'
 
 filetype plugin indent on