=> git.r.bdr.sh
=> summary
=> tree
=> log
=> refs
fe337504f2fb3ded76326b1e3d4d02787a27d853 - Ben Beltran - 1370447457
Aand that's all the plugins.
diff --git a/.gitmodules b/.gitmodules
index b572e5b..d9ba288 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,48 @@
[submodule "vim/bundle/vim-endwise"]
path = vim/bundle/vim-endwise
url = git://github.com/tpope/vim-endwise.git
+[submodule "vim/bundle/vim-fugitive"]
+ path = vim/bundle/vim-fugitive
+ url = git://github.com/tpope/vim-fugitive.git
+[submodule "vim/bundle/gist-vim"]
+ path = vim/bundle/gist-vim
+ url = https://github.com/mattn/gist-vim
+[submodule "vim/bundle/vim-indent-object"]
+ path = vim/bundle/vim-indent-object
+ url = git://github.com/michaeljsmith/vim-indent-object.git
+[submodule "vim/bundle/vim-rails"]
+ path = vim/bundle/vim-rails
+ url = git://github.com/tpope/vim-rails.git
+[submodule "vim/bundle/searchfold.vim"]
+ path = vim/bundle/searchfold.vim
+ url = git://github.com/vim-scripts/searchfold.vim.git
+[submodule "vim/bundle/vim-snipmate"]
+ path = vim/bundle/vim-snipmate
+ url = git://github.com/garbas/vim-snipmate.git
+[submodule "vim/bundle/tlib_vim"]
+ path = vim/bundle/tlib_vim
+ url = git://github.com/tomtom/tlib_vim.git
+[submodule "vim/bundle/vim-addon-mw-utils"]
+ path = vim/bundle/vim-addon-mw-utils
+ url = git://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "vim/bundle/supertab"]
+ path = vim/bundle/supertab
+ url = https://github.com/ervandew/supertab
+[submodule "vim/bundle/vim-surround"]
+ path = vim/bundle/vim-surround
+ url = git://github.com/tpope/vim-surround.git
+[submodule "vim/bundle/syntastic"]
+ path = vim/bundle/syntastic
+ url = git://github.com/scrooloose/syntastic.git
+[submodule "vim/bundle/tagbar"]
+ path = vim/bundle/tagbar
+ url = git://github.com/majutsushi/tagbar.git
+[submodule "vim/bundle/taglist"]
+ path = vim/bundle/taglist
+ url = git://github.com/vim-scripts/taglist.vim.git
+[submodule "vim/bundle/vim-unimpaired"]
+ path = vim/bundle/vim-unimpaired
+ url = git://github.com/tpope/vim-unimpaired.git
+[submodule "vim/bundle/vim-showmarks"]
+ path = vim/bundle/vim-showmarks
+ url = git://github.com/vimez/vim-showmarks.git
diff --git a/vim/after/plugin/snipMate.vim b/vim/after/plugin/snipMate.vim
deleted file mode 100644
index bdbe199..0000000
--- a/vim/after/plugin/snipMate.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-" These are the mappings for snipMate.vim. Putting it here ensures that it
-" will be mapped after other plugins such as supertab.vim.
-if !exists('loaded_snips') || exists('s:did_snips_mappings')
- finish
-endif
-let s:did_snips_mappings = 1
-
-" This is put here in the 'after' directory in order for snipMate to override
-" other plugin mappings (e.g., supertab).
-"
-" You can safely adjust these mappings to your preferences (as explained in
-" :help snipMate-remap).
-ino =TriggerSnippet()
-snor i=TriggerSnippet()
-ino =BackwardsSnippet()
-snor i=BackwardsSnippet()
-ino =ShowAvailableSnips()
-
-" The default mappings for these are annoying & sometimes break snipMate.
-" You can change them back if you want, I've put them here for convenience.
-snor b
-snor a
-snor bi
-snor ' b'
-snor ` b`
-snor % b%
-snor U bU
-snor ^ b^
-snor \ b\
-snor b
-
-" By default load snippets in snippets_dir
-if empty(snippets_dir)
- finish
-endif
-
-call GetSnippets(snippets_dir, '_') " Get global snippets
-
-au FileType * if &ft != 'help' | call GetSnippets(snippets_dir, &ft) | endif
-" vim:noet:sw=4:ts=4:ft=vim
diff --git a/vim/autoload/conque_term.vim b/vim/autoload/conque_term.vim
deleted file mode 100644
index 2780c7d..0000000
--- a/vim/autoload/conque_term.vim
+++ /dev/null
@@ -1,1590 +0,0 @@
-" FILE: plugin/conque_term.vim {{{
-"
-" AUTHOR: Nico Raffo
-" MODIFIED: 2010-05-27
-" VERSION: 1.1, for Vim 7.0
-" LICENSE:
-" Conque - pty interaction in Vim
-" Copyright (C) 2009-2010 Nico Raffo
-"
-" MIT License
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
-" }}}
-
-
-" **********************************************************************************************************
-" **** VIM FUNCTIONS ***************************************************************************************
-" **********************************************************************************************************
-
-" launch conque
-function! conque_term#open(...) "{{{
- let command = get(a:000, 0, '')
- let hooks = get(a:000, 1, [])
-
- " bare minimum validation
- if has('python') != 1
- echohl WarningMsg | echomsg "Conque requires the Python interface to be installed" | echohl None
- return 0
- endif
- if empty(command)
- echohl WarningMsg | echomsg "No command found" | echohl None
- return 0
- else
- let l:cargs = split(command, '\s')
- if !executable(l:cargs[0])
- echohl WarningMsg | echomsg "Not an executable: " . l:cargs[0] | echohl None
- return 0
- endif
- endif
-
- " set buffer window options
- let g:ConqueTerm_BufName = substitute(command, ' ', '\\ ', 'g') . "\\ -\\ " . g:ConqueTerm_Idx
- call conque_term#set_buffer_settings(command, hooks)
- let b:ConqueTerm_Var = 'ConqueTerm_' . g:ConqueTerm_Idx
- let g:ConqueTerm_Var = 'ConqueTerm_' . g:ConqueTerm_Idx
- let g:ConqueTerm_Idx += 1
-
- " open command
- try
- let l:config = '{"color":' . string(g:ConqueTerm_Color) . ',"TERM":"' . g:ConqueTerm_TERM . '"}'
- execute 'python ' . b:ConqueTerm_Var . ' = Conque()'
- execute "python " . b:ConqueTerm_Var . ".open('" . conque_term#python_escape(command) . "', " . l:config . ")"
- catch
- echohl WarningMsg | echomsg "Unable to open command: " . command | echohl None
- return 0
- endtry
-
- " set buffer mappings and auto commands
- call conque_term#set_mappings('start')
-
- startinsert!
- return 1
-endfunction "}}}
-
-" set buffer options
-function! conque_term#set_buffer_settings(command, pre_hooks) "{{{
-
- " optional hooks to execute, e.g. 'split'
- for h in a:pre_hooks
- sil exe h
- endfor
- sil exe "edit " . g:ConqueTerm_BufName
-
- " buffer settings
- setlocal nocompatible " conque won't work in compatible mode
- setlocal nopaste " conque won't work in paste mode
- setlocal buftype=nofile " this buffer is not a file, you can't save it
- setlocal nonumber " hide line numbers
- setlocal foldcolumn=0 " reasonable left margin
- setlocal nowrap " default to no wrap (esp with MySQL)
- setlocal noswapfile " don't bother creating a .swp file
- setlocal updatetime=50 " trigger cursorhold event after 50ms / XXX - global
- setlocal scrolloff=0 " don't use buffer lines. it makes the 'clear' command not work as expected
- setlocal sidescrolloff=0 " don't use buffer lines. it makes the 'clear' command not work as expected
- setlocal sidescroll=1 " don't use buffer lines. it makes the 'clear' command not work as expected
- setlocal foldmethod=manual " don't fold on {{{}}} and stuff
- setlocal bufhidden=hide " when buffer is no longer displayed, don't wipe it out
- setfiletype conque_term " useful
- sil exe "setlocal syntax=" . g:ConqueTerm_Syntax
-
-endfunction " }}}
-
-" set key mappings and auto commands
-function! conque_term#set_mappings(action) "{{{
-
- " set action
- if a:action == 'toggle'
- if exists('b:conque_on') && b:conque_on == 1
- let l:action = 'stop'
- echohl WarningMsg | echomsg "Terminal is paused" | echohl None
- else
- let l:action = 'start'
- echohl WarningMsg | echomsg "Terminal is resumed" | echohl None
- endif
- else
- let l:action = a:action
- endif
-
- " if mappings are being removed, add 'un'
- let map_modifier = 'nore'
- if l:action == 'stop'
- let map_modifier = 'un'
- endif
-
- " remove all auto commands
- if l:action == 'stop'
- execute 'autocmd! ' . b:ConqueTerm_Var
-
- else
- execute 'augroup ' . b:ConqueTerm_Var
-
- " handle unexpected closing of shell, passes HUP to parent and all child processes
- execute 'autocmd ' . b:ConqueTerm_Var . ' BufUnload python ' . b:ConqueTerm_Var . '.proc.signal(1)'
-
- " check for resized/scrolled buffer when entering buffer
- execute 'autocmd ' . b:ConqueTerm_Var . ' BufEnter python ' . b:ConqueTerm_Var . '.update_window_size()'
- execute 'autocmd ' . b:ConqueTerm_Var . ' VimResized python ' . b:ConqueTerm_Var . '.update_window_size()'
-
- " set/reset updatetime on entering/exiting buffer
- autocmd BufEnter set updatetime=50
- autocmd BufLeave set updatetime=2000
-
- " check for resized/scrolled buffer when entering insert mode
- " XXX - messed up since we enter insert mode at each updatetime
- "execute 'autocmd InsertEnter python ' . b:ConqueTerm_Var . '.screen.align()'
-
- " read more output when this isn't the current buffer
- if g:ConqueTerm_ReadUnfocused == 1
- execute 'autocmd ' . b:ConqueTerm_Var . ' CursorHold * call conque_term#read_all()'
- endif
-
- " poll for more output
- sil execute 'autocmd ' . b:ConqueTerm_Var . ' CursorHoldI python ' . b:ConqueTerm_Var . '.auto_read()'
- endif
-
- " use F22 key to get more input
- if l:action == 'start'
- sil exe 'i' . map_modifier . 'map "\\"'
- sil exe 'i' . map_modifier . 'map "\\"'
- else
- sil exe 'i' . map_modifier . 'map '
- sil exe 'i' . map_modifier . 'map '
- endif
-
- " map ASCII 1-31
- for c in range(1, 31)
- "
- if c == 27
- continue
- endif
- if l:action == 'start'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(chr(' . c . '))'
- else
- sil exe 'i' . map_modifier . 'map '
- endif
- endfor
- if l:action == 'start'
- sil exe 'n' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(chr(3))'
- else
- sil exe 'n' . map_modifier . 'map '
- endif
-
- " leave insert mode
- if !exists('g:ConqueTerm_EscKey') || g:ConqueTerm_EscKey == ''
- " use to send to terminal
- if l:action == 'start'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(chr(27))'
- else
- sil exe 'i' . map_modifier . 'map '
- endif
- else
- " use to send to terminal
- if l:action == 'start'
- sil exe 'i' . map_modifier . 'map ' . g:ConqueTerm_EscKey . ' '
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(chr(27))'
- else
- sil exe 'i' . map_modifier . 'map ' . g:ConqueTerm_EscKey
- sil exe 'i' . map_modifier . 'map '
- endif
- endif
-
- " Map in insert mode
- if exists('g:ConqueTerm_CWInsert') && g:ConqueTerm_CWInsert == 1
- inoremap j j
- inoremap k k
- inoremap h h
- inoremap l l
- inoremap w w
- endif
-
- " map ASCII 33-127
- for i in range(33, 127)
- "
- if i == 124
- if l:action == 'start'
- sil exe "i" . map_modifier . "map :python " . b:ConqueTerm_Var . ".write(chr(124))"
- else
- sil exe "i" . map_modifier . "map "
- endif
- continue
- endif
- if l:action == 'start'
- sil exe "i" . map_modifier . "map " . nr2char(i) . " :python " . b:ConqueTerm_Var . ".write(chr(" . i . "))"
- else
- sil exe "i" . map_modifier . "map " . nr2char(i)
- endif
- endfor
-
- " map ASCII 128-255
- for i in range(128, 255)
- if l:action == 'start'
- sil exe "i" . map_modifier . "map " . nr2char(i) . " :python " . b:ConqueTerm_Var . ".write('" . nr2char(i) . "')"
- else
- sil exe "i" . map_modifier . "map " . nr2char(i)
- endif
- endfor
-
- " Special cases
- if l:action == 'start'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(u"\u0008")'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(" ")'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(u"\u001b[A")'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(u"\u001b[B")'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(u"\u001b[C")'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . '.write(u"\u001b[D")'
- else
- sil exe 'i' . map_modifier . 'map '
- sil exe 'i' . map_modifier . 'map '
- sil exe 'i' . map_modifier . 'map '
- sil exe 'i' . map_modifier . 'map '
- sil exe 'i' . map_modifier . 'map '
- sil exe 'i' . map_modifier . 'map '
- endif
-
- " send selected text into conque
- if l:action == 'start'
- sil exe 'v' . map_modifier . 'map :call conque_term#send_selected(visualmode())'
- else
- sil exe 'v' . map_modifier . 'map '
- endif
-
- " remap paste keys
- if l:action == 'start'
- sil exe 'n' . map_modifier . 'map p :python ' . b:ConqueTerm_Var . '.write(vim.eval("@@"))a'
- sil exe 'n' . map_modifier . 'map P :python ' . b:ConqueTerm_Var . '.write(vim.eval("@@"))a'
- sil exe 'n' . map_modifier . 'map ]p :python ' . b:ConqueTerm_Var . '.write(vim.eval("@@"))a'
- sil exe 'n' . map_modifier . 'map [p :python ' . b:ConqueTerm_Var . '.write(vim.eval("@@"))a'
- else
- sil exe 'n' . map_modifier . 'map p'
- sil exe 'n' . map_modifier . 'map P'
- sil exe 'n' . map_modifier . 'map ]p'
- sil exe 'n' . map_modifier . 'map [p'
- endif
- if has('gui_running')
- if l:action == 'start'
- sil exe 'i' . map_modifier . 'map :python ' . b:ConqueTerm_Var . ".write(vim.eval('@+'))a"
- else
- sil exe 'i' . map_modifier . 'map '
- endif
- endif
-
- " disable other normal mode keys which insert text
- if l:action == 'start'
- sil exe 'n' . map_modifier . 'map r :echo "Replace mode disabled in shell."'
- sil exe 'n' . map_modifier . 'map R :echo "Replace mode disabled in shell."'
- sil exe 'n' . map_modifier . 'map c :echo "Change mode disabled in shell."'
- sil exe 'n' . map_modifier . 'map C :echo "Change mode disabled in shell."'
- sil exe 'n' . map_modifier . 'map