diff --git a/.VimballRecord b/.VimballRecord new file mode 100644 index 0000000..58ea232 --- /dev/null +++ b/.VimballRecord @@ -0,0 +1 @@ +rainbow_parenthsis-4.0.vba: call delete('/Users/kreitz/.vim/autoload/rainbow_parenthsis.vim')|call delete('/Users/kreitz/.vim/doc/rainbow_parenthsis.txt')|call delete('/Users/kreitz/.vim/plugin/rainbow_parenthsis.vim')|call delete('/Users/kreitz/.vim/rainbow_parenthsis_options.vim') diff --git a/.netrwhist b/.netrwhist index 2743500..5951615 100644 --- a/.netrwhist +++ b/.netrwhist @@ -1,4 +1,6 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =2 +let g:netrw_dirhist_cnt =4 let g:netrw_dirhist_1='/Users/kreitz' let g:netrw_dirhist_2='/Users/kreitz/.fontconfig' +let g:netrw_dirhist_3='/Users/kreitz' +let g:netrw_dirhist_4='/Users/kreitz/repos/public/tablib' diff --git a/bundle/rainbow/autoload/rainbow_parentheses.vim b/autoload/rainbow_parenthsis.vim similarity index 80% rename from bundle/rainbow/autoload/rainbow_parentheses.vim rename to autoload/rainbow_parenthsis.vim index 54d1374..ffbd4fe 100644 --- a/bundle/rainbow/autoload/rainbow_parentheses.vim +++ b/autoload/rainbow_parenthsis.vim @@ -1,10 +1,15 @@ "------------------------------------------------------------------------------ -" Description: Rainbow colors for parentheses +" Description: Rainbow colors for parenthsis +" $Id: rainbow_parenthsis.vim 50 2007-10-08 18:42:51Z krischik@users.sourceforge.net $ " Copyright: Copyright (C) 2007 Martin Krischik " Maintainer: Martin Krischik (krischik@users.sourceforge.net) " John Gilmore " Luc Hermitte (hermitte@free.fr) +" $Author: krischik@users.sourceforge.net $ +" $Date: 2007-10-08 20:42:51 +0200 (Mo, 08 Okt 2007) $ " Version: 4.0 +" $Revision: 50 $ +" $HeadURL: https://vim-scripts.googlecode.com/svn/trunk/1561%20Rainbow%20Parenthsis%20Bundle/autoload/rainbow_parenthsis.vim $ " History: 24.05.2006 MK Unified Headers " 15.10.2006 MK Bram's suggestion for runtime integration " 06.09.2007 LH Buffer friendly (can be used in different buffers), @@ -25,53 +30,51 @@ " Section: highlight {{{1 -function rainbow_parentheses#Activate() - highlight default level1c guifg=OrangeRed1 - highlight default level2c guifg=LightGoldenRod1 - highlight default level3c guifg=DeepSkyBlue1 - highlight default level4c guifg=HotPink1 - highlight default level5c guifg=chartreuse1 - highlight default level6c guifg=OrangeRed1 - highlight default level7c guifg=LightGoldenRod1 - highlight default level8c guifg=DeepSkyBlue1 - highlight default level9c guifg=HotPink1 - highlight default level10c guifg=chartreuse1 - highlight default level11c guifg=OrangeRed1 - highlight default level12c guifg=LightGoldenRod1 - highlight default level13c guifg=DeepSkyBlue1 - highlight default level14c guifg=HotPink1 - highlight default level15c guifg=chartreuse1 - highlight default level16c guifg=Yellow - let s:rainbow_parenthesis_active = 1 +function rainbow_parenthsis#Activate() + highlight default level1c ctermbg=LightGray ctermfg=brown guibg=WhiteSmoke guifg=RoyalBlue3 + highlight default level2c ctermbg=LightGray ctermfg=Darkblue guibg=WhiteSmoke guifg=SeaGreen3 + highlight default level3c ctermbg=LightGray ctermfg=darkgray guibg=WhiteSmoke guifg=DarkOrchid3 + highlight default level4c ctermbg=LightGray ctermfg=darkgreen guibg=WhiteSmoke guifg=firebrick3 + highlight default level5c ctermbg=LightGray ctermfg=darkcyan guibg=AntiqueWhite guifg=RoyalBlue3 + highlight default level6c ctermbg=LightGray ctermfg=darkred guibg=AntiqueWhite guifg=SeaGreen3 + highlight default level7c ctermbg=LightGray ctermfg=darkmagenta guibg=AntiqueWhite guifg=DarkOrchid3 + highlight default level8c ctermbg=LightGray ctermfg=brown guibg=AntiqueWhite guifg=firebrick3 + highlight default level9c ctermbg=LightGray ctermfg=gray guibg=LemonChiffon guifg=RoyalBlue3 + highlight default level10c ctermbg=LightGray ctermfg=black guibg=LemonChiffon guifg=SeaGreen3 + highlight default level11c ctermbg=LightGray ctermfg=darkmagenta guibg=LemonChiffon guifg=DarkOrchid3 + highlight default level12c ctermbg=LightGray ctermfg=Darkblue guibg=LemonChiffon guifg=firebrick3 + highlight default level13c ctermbg=LightGray ctermfg=darkgreen guibg=AliceBlue guifg=RoyalBlue3 + highlight default level14c ctermbg=LightGray ctermfg=darkcyan guibg=AliceBlue guifg=SeaGreen3 + highlight default level15c ctermbg=LightGray ctermfg=darkred guibg=AliceBlue guifg=DarkOrchid3 + highlight default level16c ctermbg=LightGray ctermfg=red guibg=AliceBlue guifg=firebrick3 + let rainbow_parenthesis#active = 1 endfunction -function rainbow_parentheses#Clear() +function rainbow_parenthsis#Clear() let i = 0 while i != 16 let i = i + 1 exe 'highlight clear level' . i . 'c' endwhile - let s:rainbow_parenthesis_active = 0 + let rainbow_parenthesis#active = 0 endfunction -function rainbow_parentheses#Toggle () - if ! exists('rainbow_parenthesis_active') - call rainbow_parentheses#LoadRound () +function rainbow_parenthsis#Toggle () + if ! exists('rainbow_parenthesis#active') + call rainbow_parenthsis#LoadRound () endif - if s:rainbow_parenthesis_active != 0 - call rainbow_parentheses#Clear () + if rainbow_parenthesis#active != 0 + call rainbow_parenthsis#Clear () else - call rainbow_parentheses#Activate () + call rainbow_parenthsis#Activate () endif endfunction " Section: syntax {{{1 " -syntax cluster rainbow_parentheses contains=@TOP,level1,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15,level16,NoInParens - " Subsection: parentheses or round brackets: {{{2 " -function rainbow_parentheses#LoadRound () +function rainbow_parenthsis#LoadRound () syntax region level1 matchgroup=level1c start=/(/ end=/)/ contains=TOP,level1,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level2 matchgroup=level2c start=/(/ end=/)/ contains=TOP,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level3 matchgroup=level3c start=/(/ end=/)/ contains=TOP,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens @@ -88,12 +91,12 @@ function rainbow_parentheses#LoadRound () syntax region level14 matchgroup=level14c start=/(/ end=/)/ contains=TOP,level14,level15, level16,NoInParens syntax region level15 matchgroup=level15c start=/(/ end=/)/ contains=TOP,level15, level16,NoInParens syntax region level16 matchgroup=level16c start=/(/ end=/)/ contains=TOP,level16,NoInParens - let s:rainbow_parenthesis_active = 0 + let rainbow_parenthesis#active = 0 endfunction " Subsection: box brackets or square brackets: {{{2 " -function rainbow_parentheses#LoadSquare () +function rainbow_parenthsis#LoadSquare () syntax region level1 matchgroup=level1c start=/\[/ end=/\]/ contains=TOP,level1,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level2 matchgroup=level2c start=/\[/ end=/\]/ contains=TOP,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level3 matchgroup=level3c start=/\[/ end=/\]/ contains=TOP,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens @@ -110,12 +113,12 @@ function rainbow_parentheses#LoadSquare () syntax region level14 matchgroup=level14c start=/\[/ end=/\]/ contains=TOP,level14,level15, level16,NoInParens syntax region level15 matchgroup=level15c start=/\[/ end=/\]/ contains=TOP,level15, level16,NoInParens syntax region level16 matchgroup=level16c start=/\[/ end=/\]/ contains=TOP,level16,NoInParens - let s:rainbow_parenthesis_active = 0 + let rainbow_parenthesis#active = 0 endfunction " Subsection: curly brackets or braces: {{{2 " -function rainbow_parentheses#LoadBraces () +function rainbow_parenthsis#LoadBraces () syntax region level1 matchgroup=level1c start=/{/ end=/}/ contains=TOP,level1,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level2 matchgroup=level2c start=/{/ end=/}/ contains=TOP,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level3 matchgroup=level3c start=/{/ end=/}/ contains=TOP,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens @@ -132,12 +135,12 @@ function rainbow_parentheses#LoadBraces () syntax region level14 matchgroup=level14c start=/{/ end=/}/ contains=TOP,level14,level15, level16,NoInParens syntax region level15 matchgroup=level15c start=/{/ end=/}/ contains=TOP,level15, level16,NoInParens syntax region level16 matchgroup=level16c start=/{/ end=/}/ contains=TOP,level16,NoInParens - let s:rainbow_parenthesis_active = 0 + let rainbow_parenthesis#active = 0 endfunction " Subsection: angle brackets or chevrons: {{{2 " -function rainbow_parentheses#LoadChevrons () +function rainbow_parenthsis#LoadChevrons () syntax region level1 matchgroup=level1c start=// contains=TOP,level1,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level2 matchgroup=level2c start=// contains=TOP,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens syntax region level3 matchgroup=level3c start=// contains=TOP,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens @@ -154,7 +157,7 @@ function rainbow_parentheses#LoadChevrons () syntax region level14 matchgroup=level14c start=// contains=TOP,level14,level15, level16,NoInParens syntax region level15 matchgroup=level15c start=// contains=TOP,level15, level16,NoInParens syntax region level16 matchgroup=level16c start=// contains=TOP,level16,NoInParens - let s:rainbow_parenthesis_active = 0 + let rainbow_parenthesis#active = 0 endfunction " }}}1 diff --git a/bundle/vim-peepopen/plugin/peepopen.vim b/bundle/vim-peepopen/plugin/peepopen.vim index b43659d..882f2a4 100644 --- a/bundle/vim-peepopen/plugin/peepopen.vim +++ b/bundle/vim-peepopen/plugin/peepopen.vim @@ -42,3 +42,5 @@ let &cpo = s:save_cpo unlet s:save_cpo " vim:set sw=2 sts=2: + +au VimEnter *.py NERDTree \ No newline at end of file diff --git a/bundle/rainbow/doc/rainbow_parentheses.txt b/doc/rainbow_parenthsis.txt similarity index 100% rename from bundle/rainbow/doc/rainbow_parentheses.txt rename to doc/rainbow_parenthsis.txt diff --git a/doc/tags b/doc/tags new file mode 100644 index 0000000..96508f2 --- /dev/null +++ b/doc/tags @@ -0,0 +1,13 @@ +:ToggleRaibowParenthesis rainbow_parenthsis.txt /*:ToggleRaibowParenthesis* +rainbow_parenthsis#Activate() rainbow_parenthsis.txt /*rainbow_parenthsis#Activate()* +rainbow_parenthsis#Clear() rainbow_parenthsis.txt /*rainbow_parenthsis#Clear()* +rainbow_parenthsis#LoadBraces() rainbow_parenthsis.txt /*rainbow_parenthsis#LoadBraces()* +rainbow_parenthsis#LoadChevrons() rainbow_parenthsis.txt /*rainbow_parenthsis#LoadChevrons()* +rainbow_parenthsis#LoadRound() rainbow_parenthsis.txt /*rainbow_parenthsis#LoadRound()* +rainbow_parenthsis#LoadSquare() rainbow_parenthsis.txt /*rainbow_parenthsis#LoadSquare()* +rainbow_parenthsis#Toggle() rainbow_parenthsis.txt /*rainbow_parenthsis#Toggle()* +rainbow_parenthsis-about rainbow_parenthsis.txt /*rainbow_parenthsis-about* +rainbow_parenthsis-commands rainbow_parenthsis.txt /*rainbow_parenthsis-commands* +rainbow_parenthsis-configure rainbow_parenthsis.txt /*rainbow_parenthsis-configure* +rainbow_parenthsis-functions rainbow_parenthsis.txt /*rainbow_parenthsis-functions* +rainbow_parenthsis.txt rainbow_parenthsis.txt /*rainbow_parenthsis.txt* diff --git a/bundle/rainbow/plugin/rainbow_parentheses.vim b/plugin/rainbow_parenthsis.vim similarity index 71% rename from bundle/rainbow/plugin/rainbow_parentheses.vim rename to plugin/rainbow_parenthsis.vim index 6ffd943..e5e3806 100644 --- a/bundle/rainbow/plugin/rainbow_parentheses.vim +++ b/plugin/rainbow_parenthsis.vim @@ -1,14 +1,14 @@ "------------------------------------------------------------------------------ " Description: Rainbow colors for parenthsis -" $Id: rainbow_parenthsis.vim 51 2007-10-09 18:43:58Z krischik@users.sourceforge.net $ +" $Id: rainbow_parenthsis.vim 29 2007-09-24 11:40:36Z krischik@users.sourceforge.net $ " Copyright: Copyright (C) 2006 Martin Krischik " Maintainer: Martin Krischik " John Gilmore " $Author: krischik@users.sourceforge.net $ -" $Date: 2007-10-09 14:43:58 -0400 (Tue, 09 Oct 2007) $ +" $Date: 2007-09-24 13:40:36 +0200 (Mo, 24 Sep 2007) $ " Version: 4.0 -" $Revision: 51 $ -" $HeadURL: http://vim-scripts.googlecode.com/svn/trunk/1561%20Rainbow%20Parenthsis%20Bundle/plugin/rainbow_parenthsis.vim $ +" $Revision: 29 $ +" $HeadURL: https://vim-scripts.googlecode.com/svn/trunk/1561%20Rainbow%20Parenthsis%20Bundle/plugin/rainbow_parenthsis.vim $ " History: 24.05.2006 MK Unified Headers " 15.10.2006 MK Bram's suggestion for runtime integration " 06.09.2007 LH Buffer friendly (can be used in different buffers), @@ -27,11 +27,7 @@ " times. "------------------------------------------------------------------------------ -command! -nargs=0 RainbowParenthesesToggle call rainbow_parentheses#Toggle() -command! -nargs=0 RainbowParenthesesLoadSquare call rainbow_parentheses#LoadSquare() -command! -nargs=0 RainbowParenthesesLoadRound call rainbow_parentheses#LoadRound() -command! -nargs=0 RainbowParenthesesLoadBraces call rainbow_parentheses#LoadBraces() -command! -nargs=0 RainbowParenthesesLoadChevrons call rainbow_parentheses#Chevrons() +command! -nargs=0 ToggleRaibowParenthesis call rainbow_parenthsis#Toggle() finish diff --git a/rainbow_parenthsis_options.vim b/rainbow_parenthsis_options.vim new file mode 100644 index 0000000..a36a9ad --- /dev/null +++ b/rainbow_parenthsis_options.vim @@ -0,0 +1,55 @@ +"------------------------------------------------------------------------------ +" Description: Options setable by the rainbow_parenthsis plugin +" $Id: rainbow_parenthsis_options.vim 29 2007-09-24 11:40:36Z krischik@users.sourceforge.net $ +" Copyright: Copyright (C) 2006 Martin Krischik +" Maintainer: Martin Krischik (krischik@users.sourceforge.net) +" $Author: krischik@users.sourceforge.net $ +" $Date: 2007-09-24 13:40:36 +0200 (Mo, 24 Sep 2007) $ +" Version: 4.0 +" $Revision: 29 $ +" $HeadURL: https://vim-scripts.googlecode.com/svn/trunk/1561%20Rainbow%20Parenthsis%20Bundle/rainbow_parenthsis_options.vim $ +" History: 17.11.2006 MK rainbow_parenthsis_Options +" 01.01.2007 MK Bug fixing +" 09.10.2007 MK Now with round, square brackets, curly and angle +" brackets. +" Usage: copy content into your .vimrc and change options to your +" likeing. +" Help Page: rainbow_parenthsis.txt +"------------------------------------------------------------------------------ + +echoerr 'It is suggested to copy the content of ada_options into .vimrc!' +finish " 1}}} + +" Section: rainbow_parenthsis options {{{1 + +" }}}1 + +" Section: Vimball options {{{1 +:set noexpandtab fileformat=unix encoding=utf-8 +:31,34 MkVimball rainbow_parenthsis-4.0.vba + +autoload/rainbow_parenthsis.vim +doc/rainbow_parenthsis.txt +plugin/rainbow_parenthsis.vim +rainbow_parenthsis_options.vim + +" }}}1 + +" Section: Tar options {{{1 + +tar --create --bzip2 \ + --file="rainbow_parenthsis-4.0.tar.bz2" \ + rainbow_parenthsis_options.vim \ + doc/rainbow_parenthsis.txt \ + autoload/rainbow_parenthsis.vim \ + plugin/rainbow_parenthsis.vim ; + +" }}}1 + +"------------------------------------------------------------------------------ +" Copyright (C) 2006 Martin Krischik +" +" Vim is Charityware - see ":help license" or uganda.txt for licence derainbow_parenthsiss. +"------------------------------------------------------------------------------ +" vim: textwidth=0 nowrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab +" vim: foldmethod=marker diff --git a/syntax/python.vim b/syntax/python.vim index 7eea07f..a81e5bd 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -372,7 +372,4 @@ if version >= 508 || !exists("did_python_syn_inits") endif let b:current_syntax = "python" - -runtime plugin/RainbowParenthsis.vim - -let vimtwitter_login="kennethreitz:K@reitzk" \ No newline at end of file +runtime plugin/rainbow_parenthsis.vim \ No newline at end of file diff --git a/vimrc b/vimrc index 5d42d0a..9750790 100755 --- a/vimrc +++ b/vimrc @@ -85,7 +85,7 @@ highlight BadWhitespace ctermbg=red guibg=red au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/ " For full syntax highlighting: -# let python_highlight_all=1 +let python_highlight_all=1 "set iskeyword+=. @@ -104,5 +104,6 @@ map if has("gui_macvim") let macvim_hig_shift_movement = 1 set guioptions-=T + macmenu &File.New\ Tab key= + map PeepOpen endif -