Permalink
Browse files

Update vim bundles

  • Loading branch information...
1 parent 0af3050 commit aaf96a4e9f7965329a14e3c300850c200780808f @gabebw committed Feb 20, 2013
@@ -2,7 +2,7 @@
" File: autoload/ctrlp.vim
" Description: Fuzzy file, buffer, mru, tag, etc finder.
" Author: Kien Nguyen <github.com/kien>
-" Version: 1.78
+" Version: 1.79
" =============================================================================
" ** Static variables {{{1
@@ -357,7 +357,7 @@ call s:X("Function","fad07a","","","Yellow","")
call s:X("Statement","8197bf","","","DarkBlue","")
call s:X("PreProc","8fbfdc","","","LightBlue","")
-hi! link Operator Normal
+hi! link Operator Structure
call s:X("Type","ffb964","","","Yellow","")
call s:X("NonText","606060",g:jellybeans_background_color,"",s:termBlack,"")
@@ -402,6 +402,9 @@ hi! link phpQuoteDouble StringDelimiter
hi! link phpBoolean Constant
hi! link phpNull Constant
hi! link phpArrayPair Operator
+hi! link phpOperator Normal
+hi! link phpRelation Normal
+hi! link phpVarSelector Identifier
" Python
@@ -470,9 +473,9 @@ hi! link objcMethodName Identifier
hi! link objcMethodArg Normal
hi! link objcMessageName Identifier
-" Haskell
+" Vimscript
-hi! link hsOperator Structure
+hi! link vimOper Normal
" Debugger.vim
@@ -13,7 +13,7 @@
" }}}
"
" License: {{{
-" Copyright (c) 2002 - 2012
+" Copyright (c) 2002 - 2013
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -48,7 +48,7 @@
" }}}
"
" Testing Info: {{{
-" Running vim + supertab with the absolute bar minimum settings:
+" Running vim + supertab with the absolute bare minimum settings:
" $ vim -u NONE -U NONE -c "set nocp | runtime plugin/supertab.vim"
" }}}
@@ -353,7 +353,7 @@ function! s:SetDefaultCompletionType() " {{{
endif
endfunction " }}}
-function! s:SuperTab(command) " {{{
+function! SuperTab(command) " {{{
" Used to perform proper cycle navigation as the user requests the next or
" previous entry in a completion list, and determines whether or not to simply
" retain the normal usage of <tab> based on the cursor position.
@@ -770,8 +770,8 @@ endfunction " }}}
imap <c-x> <c-r>=<SID>ManualCompletionEnter()<cr>
- imap <script> <Plug>SuperTabForward <c-r>=<SID>SuperTab('n')<cr>
- imap <script> <Plug>SuperTabBackward <c-r>=<SID>SuperTab('p')<cr>
+ imap <script> <Plug>SuperTabForward <c-r>=SuperTab('n')<cr>
+ imap <script> <Plug>SuperTabBackward <c-r>=SuperTab('p')<cr>
exec 'imap ' . g:SuperTabMappingForward . ' <Plug>SuperTabForward'
exec 'imap ' . g:SuperTabMappingBackward . ' <Plug>SuperTabBackward'
@@ -797,17 +797,17 @@ endfunction " }}}
endif
function! s:ForwardBack(command, map)
exec "let map = \"" . escape(a:map, '<') . "\""
- return pumvisible() ? s:SuperTab(a:command) : map
+ return pumvisible() ? SuperTab(a:command) : map
endfunction
if g:SuperTabCrMapping
let expr_map = 0
- try
+ if v:version > 703 || (v:version == 703 && has('patch32'))
let map_dict = maparg('<cr>', 'i', 0, 1)
- let expr_map = map_dict.expr
- catch
+ let expr_map = has_key(map_dict, 'expr') && map_dict.expr
+ else
let expr_map = maparg('<cr>', 'i') =~? '\<cr>'
- endtry
+ endif
if expr_map
" Not compatible w/ expr mappings. This is most likely a user mapping,
@@ -0,0 +1,29 @@
+Tabular
+==============
+Sometimes, it's useful to line up text. Naturally, it's nicer to have the
+computer do this for you, since aligning things by hand quickly becomes
+unpleasant. While there are other plugins for aligning text, the ones I've
+tried are either impossibly difficult to understand and use, or too simplistic
+to handle complicated tasks. This plugin aims to make the easy things easy
+and the hard things possible, without providing an unnecessarily obtuse
+interface. It's still a work in progress, and criticisms are welcome.
+
+See [Aligning Text with Tabular.vim](http://vimcasts.org/episodes/aligning-text-with-tabular-vim/)
+for a screencast that shows how Tabular.vim works.
+
+See [doc/Tabular.txt](http://raw.github.com/godlygeek/tabular/master/doc/Tabular.txt)
+for detailed documentation.
+
+Installation
+==============
+If you don't have a preferred installation method, I recommend installing
+[pathogen.vim](https://github.com/tpope/vim-pathogen), and then simply
+copy and paste:
+
+ mkdir -p ~/.vim/bundle
+ cd ~/.vim/bundle
+ git clone git://github.com/godlygeek/tabular.git
+
+Once help tags have been generated (either using Pathogen's `:Helptags`
+command, or by pointing vim's `:helptags` command at the directory where you
+installed Tabular), you can view the manual with `:help tabular`.
@@ -11,7 +11,7 @@ let g:loaded_tslime = 1
" Main function.
" Use it in your script if you want to send text to a tmux session.
function! Send_to_Tmux(text)
- if !exists("g:tmux_sessionname") || !exists("g:tmux_windowname") || !exists("g:tmux_panenumber")
+ if !exists("g:tslime")
call <SID>Tmux_Vars()
end
@@ -22,7 +22,7 @@ function! Send_to_Tmux(text)
endfunction
function! s:tmux_target()
- return '"' . g:tmux_sessionname . '":' . g:tmux_windowname . "." . g:tmux_panenumber
+ return '"' . g:tslime['session'] . '":' . g:tslime['window'] . "." . g:tslime['pane']
endfunction
function! s:set_tmux_buffer(text)
@@ -40,44 +40,63 @@ endfunction
" Window completion
function! Tmux_Window_Names(A,L,P)
- return system('tmux list-windows -t "' . g:tmux_sessionname . '" | grep -e "^\w:" | sed -e "s/ \[[0-9x]*\]$//"')
+ return <SID>TmuxWindows()
endfunction
" Pane completion
function! Tmux_Pane_Numbers(A,L,P)
- return system('tmux list-panes -t "' . g:tmux_sessionname . '":' . g:tmux_windowname . " | sed -e 's/:.*$//'")
+ return <SID>TmuxPanes()
endfunction
function! s:TmuxSessions()
let sessions = system("tmux list-sessions | sed -e 's/:.*$//'")
return sessions
endfunction
+function! s:TmuxWindows()
+ return system('tmux list-windows -t "' . g:tslime['session'] . '" | grep -e "^\w:" | sed -e "s/\s*([0-9].*//g"')
+endfunction
+
+function! s:TmuxPanes()
+ return system('tmux list-panes -t "' . g:tslime['session'] . '":' . g:tslime['window'] . " | sed -e 's/:.*$//'")
+endfunction
+
" set tslime.vim variables
function! s:Tmux_Vars()
let names = split(s:TmuxSessions(), "\n")
+ let g:tslime = {}
if len(names) == 1
- let g:tmux_sessionname = names[0]
+ let g:tslime['session'] = names[0]
else
- let g:tmux_sessionname = ''
+ let g:tslime['session'] = ''
endif
- while g:tmux_sessionname == ''
- let g:tmux_sessionname = input("session name: ", "", "custom,Tmux_Session_Names")
+ while g:tslime['session'] == ''
+ let g:tslime['session'] = input("session name: ", "", "custom,Tmux_Session_Names")
endwhile
- let g:tmux_windowname = substitute(input("window name: ", "", "custom,Tmux_Window_Names"), ":.*$" , '', 'g')
- let g:tmux_panenumber = input("pane number: ", "", "custom,Tmux_Pane_Numbers")
- if g:tmux_windowname == ''
- let g:tmux_windowname = '0'
+ let windows = split(s:TmuxWindows(), "\n")
+ if len(windows) == 1
+ let window = windows[0]
+ else
+ let window = input("window name: ", "", "custom,Tmux_Window_Names")
+ if window == ''
+ let window = windows[0]
+ endif
endif
- if g:tmux_panenumber == ''
- let g:tmux_panenumber = '0'
+ let g:tslime['window'] = substitute(window, ":.*$" , '', 'g')
+
+ let panes = split(s:TmuxPanes(), "\n")
+ if len(panes) == 1
+ let g:tslime['pane'] = panes[0]
+ else
+ let g:tslime['pane'] = input("pane number: ", "", "custom,Tmux_Pane_Numbers")
+ if g:tslime['pane'] == ''
+ let g:tslime['pane'] = panes[0]
+ endif
endif
endfunction
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
vmap <unique> <Plug>SendSelectionToTmux "ry :call Send_to_Tmux(@r)<CR>
nmap <unique> <Plug>NormalModeSendToTmux vip <Plug>SendSelectionToTmux
Oops, something went wrong.

0 comments on commit aaf96a4

Please sign in to comment.