# HG changeset patch # User Steve Losh # Date 1299718785 18000 # Node ID d845a82775fb71507529fc4aba9af598e617286c # Parent b2d5512b9b9b8739ac2494617f37a002995e8b6b# Parent ff10804d581c1d5460a5e8f02ab08d1ab0525b52 Merge, dammit. diff -r b2d5512b9b9b -r d845a82775fb .ctags --- a/.ctags Wed Mar 09 19:55:25 2011 -0500 +++ b/.ctags Wed Mar 09 19:59:45 2011 -0500 @@ -7,3 +7,4 @@ --regex-js=/([A-Za-z0-9._$]+)[ \t]*[:=][ \t]*\[/\1/,array/ --regex-js=/([^= ]+)[ \t]*=[ \t]*[^"]'[^']*/\1/,string/ --regex-js=/([^= ]+)[ \t]*=[ \t]*[^']"[^"]*/\1/,string/ +--exclude='**/ckeditor' diff -r b2d5512b9b9b -r d845a82775fb .hgrc --- a/.hgrc Wed Mar 09 19:55:25 2011 -0500 +++ b/.hgrc Wed Mar 09 19:59:45 2011 -0500 @@ -1,6 +1,7 @@ [ui] username = Steve Losh editor = vim +commitsubrepos = False [extensions] transplant = @@ -17,6 +18,7 @@ schemes = progress = fetch = +#hgsubversion = ~/lib/hg/hgsubversion/hgsubversion attic = ~/lib/hg/hgattic/attic.py paste = ~/lib/hg/hg-paste/paste.py prompt = ~/lib/hg/hg-prompt/prompt.py diff -r b2d5512b9b9b -r d845a82775fb .hgsub --- a/.hgsub Wed Mar 09 19:55:25 2011 -0500 +++ b/.hgsub Wed Mar 09 19:59:45 2011 -0500 @@ -10,3 +10,4 @@ vim/bundle/syntastic = [git]git@github.com:sjl/syntastic.git vim/bundle/vim-coffee-script = [git]git://github.com/kchmck/vim-coffee-script.git vim/bundle/vim-javascript = [git]git://github.com/pangloss/vim-javascript.git +vim/bundle/strftimedammit = [hg]http://bitbucket.org/sjl/strftimedammit.vim/ diff -r b2d5512b9b9b -r d845a82775fb .hgsubstate --- a/.hgsubstate Wed Mar 09 19:55:25 2011 -0500 +++ b/.hgsubstate Wed Mar 09 19:59:45 2011 -0500 @@ -1,11 +1,12 @@ -0beba32679db6cf5db08ae57c5e99e411b54adc5 mercurial/templates +b9bd86b9f476afd164237dce029a46d2607bd931 mercurial/templates b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack -c839b22aa01560d8f25c7cbec13f93cb8fdcd4c5 vim/bundle/gundo +89df25515c4c6febd19d619312b4aec096ff654a vim/bundle/gundo 1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown 930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter 7650cdc6621cd15b047dc04605b8b0bc0396564d vim/bundle/nerdtree c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup +6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit 27710a2224d6dd0486d1c40d09ef18dd752e7d37 vim/bundle/surround 60731769663ea23b4763f3f0034da445ebcd3ddd vim/bundle/syntastic b9b4407a19acc4eb344cca0cc5beea75e9ff5491 vim/bundle/vim-coffee-script diff -r b2d5512b9b9b -r d845a82775fb mutt/muttrc --- a/mutt/muttrc Wed Mar 09 19:55:25 2011 -0500 +++ b/mutt/muttrc Wed Mar 09 19:59:45 2011 -0500 @@ -110,6 +110,7 @@ bind index K next-unread bind index,pager R group-reply bind index \Cp recall-message +bind index collapse-thread # macros macro index \Cr "N" "mark tagged messages as read" diff -r b2d5512b9b9b -r d845a82775fb vim/.vimrc --- a/vim/.vimrc Wed Mar 09 19:55:25 2011 -0500 +++ b/vim/.vimrc Wed Mar 09 19:59:45 2011 -0500 @@ -40,6 +40,9 @@ set listchars=tab:▸\ ,eol:¬ set shell=/bin/bash set lazyredraw +set wildignore+=*.pyc,.hg,.git +set matchtime=3 +set showbreak=↪ " Save when losing focus au FocusLost * :wa @@ -51,9 +54,9 @@ set softtabstop=4 set expandtab set wrap -set textwidth=79 +set textwidth=85 set formatoptions=qrn1 -set colorcolumn=85 +set colorcolumn=+1 " }}} " Status line {{{ @@ -75,7 +78,7 @@ let maplocalleader = "\\" " }}} -" Color scheme (terminal) {{{ +" Color scheme {{{ syntax on set background=dark @@ -84,43 +87,63 @@ " }}} " }}} -" Useful Abbreviations -------------------------------------------------------- {{{ +" Useful abbreviations -------------------------------------------------------- {{{ iabbrev ldis ಠ_ಠ +iabbrev sl/ http://stevelosh.com/ +iabbrev bb/ http://bitbucket.org/ +iabbrev bbs/ http://bitbucket.org/sjl/ +iabbrev sl@ steve@stevelosh.com " }}} -" Searching and Movement ------------------------------------------------------ {{{ +" Searching and movement ------------------------------------------------------ {{{ +" Use sane regexes. nnoremap / /\v vnoremap / /\v set ignorecase set smartcase + set incsearch set showmatch set hlsearch + set gdefault map :noh runtime macros/matchit.vim -nmap % -vmap % +map % nnoremap Y y$ nnoremap D d$ +" Keep search matches in the middle of the window. +nnoremap * *zz +nnoremap ? ?zz nnoremap n nzz nnoremap N Nzz -nnoremap L $ -vnoremap L $ -onoremap L $ +" L is easier to type, and I never use the default behavior. +noremap L $ +" Error navigation {{{ +" +" Location List QuickFix Window +" (i.e. Syntastic) (i.e. Ack) +" ---------------------------------- +" Next | M-k M-Down | +" Previous | M-l M-Up | +" ---------------------------------- +" nnoremap ˚ :lnext nnoremap ¬ :lprevious inoremap ˚ :lnext inoremap ¬ :lprevious +nnoremap :cnext +nnoremap :cprevious +" }}} " Directional Keys {{{ @@ -150,8 +173,13 @@ " Folding --------------------------------------------------------------------- {{{ set foldlevelstart=0 + +" Space to toggle folds. nnoremap za vnoremap za + +" Make zO recursively open whatever top level fold we're in, no matter where the +" cursor happens to be. nnoremap zO zCzO function! MyFoldText() " {{{ @@ -176,8 +204,8 @@ " Fuck you, help key. set fuoptions=maxvert,maxhorz +noremap :set invfullscreen inoremap :set invfullscreena -noremap :set invfullscreen " Fuck you too, manual key. nnoremap K @@ -189,78 +217,156 @@ " Various filetype-specific stuff --------------------------------------------- {{{ " Cram {{{ + au BufNewFile,BufRead *.t set filetype=cram + let cram_fold=1 autocmd Syntax cram setlocal foldlevel=1 + " }}} " Clojure {{{ -au BufNewFile,BufRead *.clj nmap ee 0;\et + au FileType clojure call TurnOnClojureFolding() + +" Eval toplevel form, even when you're on the opening paren. +au FileType clojure nmap ee 0;\et + " }}} " C {{{ -au BufNewFile,BufRead *.c setlocal foldmethod=syntax +au FileType c setlocal foldmethod=syntax " }}} " HTML and HTMLDjango {{{ + au BufNewFile,BufRead *.html setlocal filetype=htmldjango au BufNewFile,BufRead *.html setlocal foldmethod=manual + +" Use f to fold the current tag. au BufNewFile,BufRead *.html nnoremap f Vatzf + +" Use Shift-Return to turn this: +" | +" +" into this: +" +" | +" au BufNewFile,BufRead *.html inoremap kA -au BufNewFile,BufRead *.html imap -au BufNewFile,BufRead *.html imap . -au BufNewFile,BufRead *.html nnoremap vitavitoi +au BufNewFile,BufRead *.html nnoremap vitavitoi + +" Sparkup mappings: +" +" to expand sparkup normally: +"

|

+" +" to force an expanded sparkup. +"

+" | +"

+au BufNewFile,BufRead *.html imap +au BufNewFile,BufRead *.html imap . + " }}} -" CSS {{{ -au BufNewFile,BufRead *.css setlocal foldmethod=marker -au BufNewFile,BufRead *.css setlocal foldmarker={,} -au BufNewFile,BufRead *.css nnoremap cc ddko -au BufNewFile,BufRead *.css nnoremap S ?{jV/^\s*\}?$k:sort:noh -au BufNewFile,BufRead *.css inoremap { {}.kA -" }}} -" LessCSS {{{ +" CSS and LessCSS {{{ + au BufNewFile,BufRead *.less setlocal filetype=less + +au BufNewFile,BufRead *.css setlocal foldmethod=marker au BufNewFile,BufRead *.less setlocal foldmethod=marker + +au BufNewFile,BufRead *.css setlocal foldmarker={,} au BufNewFile,BufRead *.less setlocal foldmarker={,} + +" Use cc to change lines without borking the indentation. +au BufNewFile,BufRead *.css nnoremap cc ddko au BufNewFile,BufRead *.less nnoremap cc ddko -au BufNewFile,BufRead *.less nnoremap S ?{jV/^\s*\}?$k:sort:noh + +" Use S to sort properties. Turns this: +" +" p { +" width: 200px; +" height: 100px; +" background: red; +" +" ... +" } +" +" into this: + +" p { +" background: red; +" height: 100px; +" width: 200px; +" +" ... +" } +" +au BufNewFile,BufRead *.css nnoremap S ?{jV/\v^\s*\}?$k:sort:noh +au BufNewFile,BufRead *.less nnoremap S ?{jV/\v^\s*\}?$k:sort:noh + +" Make { insert a pair of brackets in such a way that the cursor is correctly +" positioned inside of them AND the following code doesn't get unfolded. +au BufNewFile,BufRead *.css inoremap { {}.kA au BufNewFile,BufRead *.less inoremap { {}.kA + " }}} " Javascript {{{ -au BufNewFile,BufRead *.js setlocal foldmethod=marker -au BufNewFile,BufRead *.js setlocal foldmarker={,} + +au FileType javascript setlocal foldmethod=marker +au FileType javascript setlocal foldmarker={,} + " }}} " Confluence {{{ + au BufRead,BufNewFile *.confluencewiki setlocal filetype=confluencewiki -au BufRead,BufNewFile *.confluencewiki setlocal wrap linebreak nolist + +" Wiki pages should be soft-wrapped. +au FileType confluencewiki setlocal wrap linebreak nolist + " }}} " Fish {{{ + au BufNewFile,BufRead *.fish setlocal filetype=fish + " }}} " Markdown {{{ + au BufNewFile,BufRead *.m*down setlocal filetype=markdown + +" Use 1/2/3 to add headings. au Filetype markdown nnoremap 1 yypVr= au Filetype markdown nnoremap 2 yypVr- au Filetype markdown nnoremap 3 I### + " }}} " Vim {{{ + au FileType vim setlocal foldmethod=marker +au FileType help setlocal textwidth=78 + " }}} " Python {{{ + au Filetype python noremap rr :RopeRename au Filetype python vnoremap rm :RopeExtractMethod au Filetype python noremap ri :RopeOrganizeImports + " }}} " Django {{{ + au BufNewFile,BufRead urls.py setlocal nowrap au BufNewFile,BufRead urls.py normal! zR au BufNewFile,BufRead settings.py normal! zR au BufNewFile,BufRead dashboard.py normal! zR + " }}} " Nginx {{{ -au BufRead,BufNewFile /etc/nginx/conf/* set ft=nginx -au BufRead,BufNewFile /etc/nginx/sites-available/* set ft=nginx + +au BufRead,BufNewFile /etc/nginx/conf/* set ft=nginx +au BufRead,BufNewFile /etc/nginx/sites-available/* set ft=nginx au BufRead,BufNewFile /usr/local/etc/nginx/sites-available/* set ft=nginx + " }}} " }}} @@ -278,9 +384,6 @@ " Formatting, TextMate-style nnoremap q gqip -" Faster Make -nnoremap m :make - " Easier linewise reselection nnoremap v V`] @@ -290,13 +393,20 @@ " Faster Esc inoremap jk -" TextMate-Style Autocomplete -inoremap -inoremap +" Marks and Quotes +noremap ' ` +noremap æ ' +noremap ` " Scratch nmap :Sscratchx:resize 15 +" Better Completion +set completeopt=longest,menuone +inoremap pumvisible() ? "\" : "\u\" +inoremap pumvisible() ? '' : '=pumvisible() ? "\up>" : ""' +inoremap pumvisible() ? '' : '=pumvisible() ? "\Down>" : ""' + " Make selecting inside an HTML tag less dumb nnoremap Vit vitVkoj nnoremap Vat vatV @@ -329,51 +439,77 @@ cmap Wq wq " }}} -" Plugin Settings ------------------------------------------------------------- {{{ +" Plugin settings ------------------------------------------------------------- {{{ " NERD Tree {{{ + map :NERDTreeToggle let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$', 'whoosh_index', 'xapian_index', '.*.pid', 'monitor.py', '.*-fixtures-.*.json', '.*\.o'] + " }}} " HTML5 {{{ + let g:event_handler_attributes_complete = 0 let g:rdfa_attributes_complete = 0 let g:microdata_attributes_complete = 0 let g:atia_attributes_complete = 0 + " }}} " Rope {{{ + let ropevim_enable_shortcuts = 0 let ropevim_guess_project = 1 let ropevim_global_prefix = 'p' source $HOME/.vim/sadness/sadness.vim + " }}} " Gundo {{{ + nnoremap :GundoToggle let g:gundo_debug = 1 let g:gundo_preview_bottom = 1 + " }}} " VimClojure {{{ + let vimclojure#HighlightBuiltins = 1 let vimclojure#ParenRainbow = 1 let vimclojure#WantNailgun = 1 let vimclojure#NailgunClient = $HOME . "/.vim/bundle/vimclojure/bin/ng" let vimclojure#SplitPos = "right" + " }}} " Syntastic {{{ + let g:syntastic_enable_signs=1 let g:syntastic_disabled_filetypes = ['html', 'python'] + +" }}} +" Command-T {{{ + +let g:CommandTMaxHeight = 20 + +" }}} +" LISP (built-in) {{{ + +let g:lisp_rainbow = 1 + " }}} " }}} " Synstack -------------------------------------------------------------------- {{{ +" Show the stack of syntax hilighting classes affecting whatever is under the +" cursor. function! SynStack() " {{{ if !exists("*synstack") return endif + echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")') endfunc " }}} + nmap :call SynStack() " }}} @@ -443,11 +579,9 @@ inoremap A: " }}} -" Error toggle ---------------------------------------------------------------- {{{ +" Error toggles --------------------------------------------------------------- {{{ -nmap :ErrorsToggle command! ErrorsToggle call ErrorsToggle() - function! ErrorsToggle() " {{{ if exists("w:is_error_window") unlet w:is_error_window @@ -459,12 +593,27 @@ endif endfunction " }}} +command! -bang -nargs=? QFixToggle call QFixToggle(0) +function! QFixToggle(forced) " {{{ + if exists("g:qfix_win") && a:forced == 0 + cclose + unlet g:qfix_win + else + copen 10 + let g:qfix_win = bufnr("$") + endif +endfunction " }}} + +nmap :ErrorsToggle +nmap :QFixToggle + " }}} " Open quoted ----------------------------------------------------------------- {{{ nnoremap :OpenQuoted command! OpenQuoted call OpenQuoted() +" Open the file in the current (or next) set of quotes. function! OpenQuoted() " {{{ let @r = '' @@ -483,28 +632,42 @@ endfunction " }}} " }}} +" Ctags ----------------------------------------------------------------------- {{{ + +map T :!/usr/local/bin/ctags -R . $(test -f .venv && echo ~/lib/virtualenvs/`cat .venv`) + +" }}} " MacVim ---------------------------------------------------------------------- {{{ if has('gui_running') set guifont=Menlo:h12 + " Remove all the UI cruft set go-=T set go-=l set go-=L set go-=r set go-=R + " PeepOpen if has("gui_macvim") macmenu &File.New\ Tab key= - map t PeepOpen - map ,wPeepOpen + map PeepOpen end - let g:sparkupExecuteMapping = '' + " Only map Sparkup to ⌘+e when running in MacVim. + let g:sparkupExecuteMapping = '' + let g:sparkupNextMapping = '' highlight SpellBad term=underline gui=undercurl guisp=Orange -else - set nocursorline + + " Use a line-drawing char for pretty vertical splits. + set fillchars=vert:│ + + " Different cursors for different modes. + set guicursor=n-c:block-Cursor-blinkon0 + set guicursor+=v:block-vCursor-blinkon0 + set guicursor+=i-ci:ver20-iCursor endif " }}} diff -r b2d5512b9b9b -r d845a82775fb vim/bundle/peepopen/plugin/peepopen.vim --- a/vim/bundle/peepopen/plugin/peepopen.vim Wed Mar 09 19:55:25 2011 -0500 +++ b/vim/bundle/peepopen/plugin/peepopen.vim Wed Mar 09 19:59:45 2011 -0500 @@ -26,7 +26,7 @@ function s:LaunchPeepOpenViaVim() let cwd = getcwd() - silent exe "!open -a PeepOpen " . shellescape(cwd) + silent exe "!open 'peepopen://" . shellescape(cwd) . "?editor=MacVim'" endfunction command! PeepOpen :call LaunchPeepOpenViaVim() diff -r b2d5512b9b9b -r d845a82775fb vim/bundle/rainbow/autoload/rainbow_parentheses.vim --- a/vim/bundle/rainbow/autoload/rainbow_parentheses.vim Wed Mar 09 19:55:25 2011 -0500 +++ b/vim/bundle/rainbow/autoload/rainbow_parentheses.vim Wed Mar 09 19:59:45 2011 -0500 @@ -1,31 +1,13 @@ "------------------------------------------------------------------------------ -" Description: Rainbow colors for parentheses -" Copyright: Copyright (C) 2007 Martin Krischik -" Maintainer: Martin Krischik (krischik@users.sourceforge.net) -" John Gilmore -" Luc Hermitte (hermitte@free.fr) -" Version: 4.0 -" 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), -" can be toggled -" 09.09.2007 MK Use on LH's suggestion but use autoload to -" impove memory consumtion and startup performance -" 09.10.2007 MK Now with round, square brackets, curly and angle -" brackets. -" Usage: copy to autoload directory. -"------------------------------------------------------------------------------ -" This is a simple script. It extends the syntax highlighting to -" highlight each matching set of parens in different colors, to make -" it visually obvious what matches which. -" -" Obviously, most useful when working with lisp or Ada. But it's also nice other -" times. +" Description: Rainbow colors for parentheses, based on rainbow_parenthsis.vim +" by Martin Krischik and others. This version cleans things up, +" simplifies a few things, and changes "parenthsis" to +" "parentheses". "------------------------------------------------------------------------------ " Section: highlight {{{1 -function rainbow_parentheses#Activate() +function! rainbow_parentheses#Activate() highlight default level1c guifg=OrangeRed1 highlight default level2c guifg=LightGoldenRod1 highlight default level3c guifg=DeepSkyBlue1 @@ -42,36 +24,36 @@ highlight default level14c guifg=HotPink1 highlight default level15c guifg=chartreuse1 highlight default level16c guifg=Yellow - let s:rainbow_parenthesis_active = 1 + let s:rainbow_paren_active = 1 endfunction -function rainbow_parentheses#Clear() +function! rainbow_parentheses#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 s:rainbow_paren_active = 0 endfunction -function rainbow_parentheses#Toggle () - if ! exists('rainbow_parenthesis_active') - call rainbow_parentheses#LoadRound () +function! rainbow_parentheses#Toggle () + if !exists('s:rainbow_paren_active') + call rainbow_parentheses#LoadRound() endif - if s:rainbow_parenthesis_active != 0 - call rainbow_parentheses#Clear () + if s:rainbow_paren_active != 0 + call rainbow_parentheses#Clear() else - call rainbow_parentheses#Activate () + call rainbow_parentheses#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_parentheses#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 +70,12 @@ 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 s:rainbow_paren_active = 0 endfunction " Subsection: box brackets or square brackets: {{{2 " -function rainbow_parentheses#LoadSquare () +function! rainbow_parentheses#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 +92,12 @@ 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 s:rainbow_paren_active = 0 endfunction " Subsection: curly brackets or braces: {{{2 " -function rainbow_parentheses#LoadBraces () +function! rainbow_parentheses#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 +114,12 @@ 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 s:rainbow_paren_active = 0 endfunction " Subsection: angle brackets or chevrons: {{{2 " -function rainbow_parentheses#LoadChevrons () +function! rainbow_parentheses#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,16 +136,9 @@ 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 s:rainbow_paren_active = 0 endfunction - " }}}1 -finish +" }}}1 -"------------------------------------------------------------------------------ -" Copyright (C) 2006 Martin Krischik -" -" Vim is Charityware - see ":help license" or uganda.txt for licence details. -"------------------------------------------------------------------------------ -" vim: textwidth=78 wrap tabstop=8 shiftwidth=4 softtabstop=4 expandtab -" vim: filetype=vim foldmethod=marker +finish diff -r b2d5512b9b9b -r d845a82775fb vim/bundle/rainbow/plugin/rainbow_parentheses.vim --- a/vim/bundle/rainbow/plugin/rainbow_parentheses.vim Wed Mar 09 19:55:25 2011 -0500 +++ b/vim/bundle/rainbow/plugin/rainbow_parentheses.vim Wed Mar 09 19:59:45 2011 -0500 @@ -1,44 +1,13 @@ "------------------------------------------------------------------------------ -" Description: Rainbow colors for parenthsis -" $Id: rainbow_parenthsis.vim 51 2007-10-09 18:43:58Z 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) $ -" Version: 4.0 -" $Revision: 51 $ -" $HeadURL: http://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), -" can be toggled -" 09.09.2007 MK Use on LH's suggestion but use autoload to -" impove memory consumtion and startup performance -" 09.10.2007 MK Now with round, square brackets, curly and angle -" brackets. -" Usage: copy to plugin directory. -"------------------------------------------------------------------------------ -" This is a simple script. It extends the syntax highlighting to -" highlight each matching set of parens in different colors, to make -" it visually obvious what matches which. -" -" Obviously, most useful when working with lisp or Ada. But it's also nice other -" times. +" Description: Rainbow colors for parentheses, based on rainbow_parenthsis.vim +" by Martin Krischik. This version cleans things up, simplifies +" a few things, and changes "parenthsis" to "parentheses". "------------------------------------------------------------------------------ -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 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() finish - -"------------------------------------------------------------------------------ -" Copyright (C) 2006 Martin Krischik -" -" Vim is Charityware - see ":help license" or uganda.txt for licence details. -"------------------------------------------------------------------------------ -" vim: textwidth=78 wrap tabstop=8 shiftwidth=4 softtabstop=4 expandtab -" vim: filetype=vim foldmethod=marker diff -r b2d5512b9b9b -r d845a82775fb vim/castrate.py --- a/vim/castrate.py Wed Mar 09 19:55:25 2011 -0500 +++ b/vim/castrate.py Wed Mar 09 19:59:45 2011 -0500 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Original source: http://forrst.com/posts/An_unball_script_for_vimball_plugins-CHM import os, sys diff -r b2d5512b9b9b -r d845a82775fb vim/colors/molokai.vim --- a/vim/colors/molokai.vim Wed Mar 09 19:55:25 2011 -0500 +++ b/vim/colors/molokai.vim Wed Mar 09 19:59:45 2011 -0500 @@ -13,39 +13,50 @@ set background=dark let g:colors_name="molokai" -hi Normal guifg=#F8F8F2 guibg=#1B1D1E -hi Folded guifg=#666666 guibg=#1B1D1E -hi Comment guifg=#5c7176 +" Basic Layout {{{ +hi Normal guifg=#F8F8F2 guibg=#1B1E1F +hi Folded guifg=#666666 guibg=bg hi CursorLine guibg=#232728 hi CursorColumn guibg=#232728 hi ColorColumn guibg=#232728 -hi LineNr guifg=#AAAAAA guibg=#1B1D1E -hi FoldColumn guifg=#AAAAAA guibg=#1B1D1E - +hi LineNr guifg=#AAAAAA guibg=bg +hi FoldColumn guifg=#AAAAAA guibg=bg +hi VertSplit guifg=#AAAAAA guibg=bg gui=none +hi Search guifg=#000000 guibg=#E4E500 +hi IncSearch guibg=#000000 guifg=#FF8D00 +" }}} +" Syntax {{{ hi Boolean guifg=#AE81FF +hi Comment guifg=#5c7176 hi Character guifg=#E6DB74 hi Number guifg=#AE81FF hi String guifg=#E6DB74 hi Conditional guifg=#F92672 gui=bold hi Constant guifg=#AE81FF gui=bold -hi Cursor guifg=#000000 guibg=#F35FBC hi Debug guifg=#BCA3A3 gui=bold hi Define guifg=#66D9EF hi Delimiter guifg=#8F8F8F +hi Float guifg=#AE81FF +hi Function guifg=#A6E22E +hi Identifier guifg=#FD971F +" }}} +" Diffs {{{ hi DiffAdd guibg=#0F1D0B hi DiffChange guifg=#89807D guibg=#322F2D hi DiffDelete guifg=#960050 guibg=#1E0010 hi DiffText guibg=#4A4340 gui=italic,bold +" }}} +" Cursor {{{ +hi Cursor guifg=#000000 guibg=#F35FBC +hi iCursor guifg=#000000 guibg=#FDFF00 +hi vCursor guifg=#000000 guibg=#AAF412 +" }}} hi Directory guifg=#A6E22E gui=bold hi Error guifg=#960050 guibg=#1E0010 hi ErrorMsg guifg=#F92672 guibg=#232526 gui=bold hi Exception guifg=#A6E22E gui=bold -hi Float guifg=#AE81FF -hi Function guifg=#A6E22E -hi Identifier guifg=#FD971F hi Ignore guifg=#808080 guibg=bg -hi IncSearch guifg=#C4BE89 guibg=#000000 hi Keyword guifg=#F92672 gui=bold hi Label guifg=#E6DB74 gui=none @@ -57,17 +68,17 @@ hi MoreMsg guifg=#E6DB74 hi Operator guifg=#F92672 -" complete menu -hi Pmenu guifg=#66D9EF guibg=#000000 -hi PmenuSel guibg=#808080 -hi PmenuSbar guibg=#080808 -hi PmenuThumb guifg=#66D9EF +" Completion Menu {{{ +hi Pmenu guifg=#cccccc guibg=#232728 +hi PmenuSel guifg=#000000 guibg=#AAF412 +hi PmenuSbar guibg=#131414 +hi PmenuThumb guifg=#777777 +" }}} hi PreCondit guifg=#A6E22E gui=bold hi PreProc guifg=#A6E22E hi Question guifg=#66D9EF hi Repeat guifg=#F92672 gui=bold -hi Search guifg=#FFFFFF guibg=#455354 " marks column hi SignColumn guifg=#A6E22E guibg=#151617 @@ -75,12 +86,6 @@ hi SpecialComment guifg=#465457 gui=bold hi Special guifg=#66D9EF guibg=bg gui=italic hi SpecialKey guifg=#888A85 gui=italic -if has("spell") - hi SpellBad guisp=#FF0000 gui=undercurl - hi SpellCap guisp=#7070F0 gui=undercurl - hi SpellLocal guisp=#70F0F0 gui=undercurl - hi SpellRare guisp=#FFFFFF gui=undercurl -endif hi Statement guifg=#F92672 gui=bold hi StatusLine guifg=#CD5907 guibg=fg hi StatusLineNC guifg=#808080 guibg=#080808 @@ -94,22 +99,29 @@ hi Type guifg=#66D9EF gui=none hi Underlined guifg=#808080 gui=underline -hi VertSplit guifg=#AAAAAA guibg=#151617 gui=none -hi VisualNOS guibg=#403D3D -hi Visual guibg=#403D3D hi WarningMsg guifg=#FFFFFF guibg=#333333 gui=bold hi WildMenu guifg=#66D9EF guibg=#000000 -hi MyTagListFileName guifg=#F92672 guibg=#1B1D1E gui=bold - +hi MyTagListFileName guifg=#F92672 guibg=bg gui=bold -" Invisible character colors -highlight NonText guifg=#444444 guibg=#1B1D1E -highlight SpecialKey guifg=#444444 guibg=#1B1D1E +" Spelling {{{ +if has("spell") + hi SpellBad guisp=#FF0000 gui=undercurl + hi SpellCap guisp=#7070F0 gui=undercurl + hi SpellLocal guisp=#70F0F0 gui=undercurl + hi SpellRare guisp=#FFFFFF gui=undercurl +endif +" }}} +" Visual Mode {{{ +hi VisualNOS guibg=#403D3D +hi Visual guibg=#403D3D +" }}} +" Invisible character colors {{{ +highlight NonText guifg=#444444 guibg=bg +highlight SpecialKey guifg=#444444 guibg=bg +" }}} -" -" Support for 256-color terminal -" +" Support for 256-color terminals {{{ if &t_Co > 255 hi Boolean ctermfg=135 hi Character ctermfg=144 @@ -132,8 +144,8 @@ hi ErrorMsg ctermfg=199 ctermbg=16 cterm=bold hi Exception ctermfg=118 cterm=bold hi Float ctermfg=135 - hi FoldColumn ctermfg=67 ctermbg=16 - hi Folded ctermfg=67 ctermbg=16 + hi FoldColumn ctermfg=67 ctermbg=233 + hi Folded ctermfg=67 ctermbg=233 hi Function ctermfg=118 hi Identifier ctermfg=208 hi Ignore ctermfg=244 ctermbg=232 @@ -143,6 +155,8 @@ hi Label ctermfg=229 cterm=none hi Macro ctermfg=193 hi SpecialKey ctermfg=81 + hi MailHeaderEmail ctermfg=3 ctermbg=233 + hi MailEmail ctermfg=3 ctermbg=233 hi MatchParen ctermfg=16 ctermbg=208 cterm=bold hi ModeMsg ctermfg=229 @@ -194,4 +208,4 @@ hi ColorColumn ctermbg=234 hi LineNr ctermfg=250 ctermbg=233 hi NonText ctermfg=240 ctermbg=233 -end +end " }}} diff -r b2d5512b9b9b -r d845a82775fb vim/colors/mustang.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/colors/mustang.vim Wed Mar 09 19:59:45 2011 -0500 @@ -0,0 +1,60 @@ +" Maintainer: Henrique C. Alves (hcarvalhoalves@gmail.com) +" Version: 1.0 +" Last Change: September 25 2008 + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "mustang" + +" Vim >= 7.0 specific colors +if version >= 700 + hi CursorLine guibg=#2d2d2d ctermbg=236 + hi ColorColumn guibg=#2d2d2d ctermbg=236 + hi CursorColumn guibg=#2D2D2D ctermbg=236 + hi MatchParen guifg=#d0ffc0 guibg=#2f2f2f gui=bold ctermfg=157 ctermbg=237 cterm=bold + hi Pmenu guifg=#ffffff guibg=#444444 ctermfg=255 ctermbg=238 + hi PmenuSel guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148 +endif + +" General colors +hi Cursor guifg=NONE guibg=#626262 gui=none ctermbg=241 +hi Normal guifg=#e2e2e5 guibg=#202020 gui=none ctermfg=253 ctermbg=234 +hi NonText guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=235 +hi LineNr guifg=#808080 guibg=#000000 gui=none ctermfg=244 ctermbg=232 +hi StatusLine guifg=#d3d3d5 guibg=#444444 gui=italic ctermfg=253 ctermbg=238 cterm=italic +hi StatusLineNC guifg=#939395 guibg=#444444 gui=none ctermfg=246 ctermbg=238 +hi VertSplit guifg=#444444 guibg=#444444 gui=none ctermfg=238 ctermbg=238 +hi Folded guibg=#202020 guifg=#808080 gui=none ctermbg=4 ctermfg=248 +hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=254 cterm=bold +hi Visual guifg=#faf4c6 guibg=#3c414c gui=none ctermfg=254 ctermbg=4 +hi SpecialKey guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=236 + +" Syntax highlighting +hi Comment guifg=#606060 gui=italic ctermfg=244 +hi Todo guifg=#8f8f8f gui=italic ctermfg=245 +hi Boolean guifg=#b1d631 gui=none ctermfg=148 +hi String guifg=#b1d631 gui=italic ctermfg=148 +hi Identifier guifg=#b1d631 gui=none ctermfg=148 +hi Function guifg=#ffffff gui=bold ctermfg=255 +hi Type guifg=#7e8aa2 gui=none ctermfg=103 +hi Statement guifg=#7e8aa2 gui=none ctermfg=103 +hi Keyword guifg=#ff9800 gui=none ctermfg=208 +hi Constant guifg=#ff9800 gui=none ctermfg=208 +hi Number guifg=#ff9800 gui=none ctermfg=208 +hi Special guifg=#ff9800 gui=none ctermfg=208 +hi PreProc guifg=#faf4c6 gui=none ctermfg=230 +hi Todo guifg=#000000 guibg=#e6ea50 gui=italic + +" Code-specific colors +hi pythonOperator guifg=#7e8aa2 gui=none ctermfg=103 + +" Cursor Colors +hi Cursor guifg=#000000 guibg=#F35FBC +hi iCursor guifg=#000000 guibg=#FDFF00 +hi vCursor guifg=#000000 guibg=#AAF412 diff -r b2d5512b9b9b -r d845a82775fb vim/colors/vitamins.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/colors/vitamins.vim Wed Mar 09 19:59:45 2011 -0500 @@ -0,0 +1,55 @@ +" Maintainer: Henrique C. Alves (hcarvalhoalves@gmail.com) +" Version: 1.1 +" Last Change: September 23 2008 + +set background=dark + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "vitamins" + +" Vim >= 7.0 specific colors +if version >= 700 + hi CursorLine guibg=#2d2d2d ctermbg=236 + hi ColorColumn guibg=#2d2d2d ctermbg=236 + hi CursorColumn guibg=#2d2d2d ctermbg=236 + hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold ctermbg=59 + hi Pmenu guifg=#f6f3e8 guibg=#444444 ctermbg=242 + hi PmenuSel guifg=#000000 guibg=#cdd129 ctermfg=0 ctermbg=184 +endif + +" General colors +hi Cursor guifg=NONE guibg=#656565 gui=none ctermbg=0x241 +hi Normal guifg=#f6f3f0 guibg=#212121 gui=none ctermfg=254 ctermbg=235 +hi NonText guifg=#808080 guibg=#212121 gui=none ctermfg=242 ctermbg=237 +hi LineNr guifg=#5c5a4f guibg=#000000 gui=none ctermfg=239 ctermbg=232 +hi StatusLine guifg=#f6f3e8 guibg=#444444 gui=italic +hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none +hi VertSplit guifg=#777777 guibg=#212121 gui=none +hi Folded guibg=#212121 guifg=#777777 gui=none +hi Title guifg=#f6f3e8 guibg=NONE gui=bold +hi Visual guifg=#ffffd7 guibg=#444444 gui=none ctermfg=186 ctermbg=238 +hi SpecialKey guifg=#808080 guibg=#212121 gui=none + +" Syntax highlighting +hi Comment guifg=#aaaaaa gui=italic ctermfg=244 +hi Todo guifg=#8f8f8f gui=italic ctermfg=245 +hi Constant guifg=#acf0f2 gui=none ctermfg=159 +hi String guifg=#ff5d28 gui=italic ctermfg=202 +hi Identifier guifg=#ff5d28 gui=none ctermfg=202 +hi Function guifg=#cdd129 gui=none ctermfg=184 +hi Type guifg=#cdd129 gui=none ctermfg=184 +hi Statement guifg=#af5f5f gui=none ctermfg=131 +hi Keyword guifg=#cdd129 gui=none ctermfg=184 +hi PreProc guifg=#ede39e gui=none ctermfg=187 +hi Number guifg=#ede39e gui=none ctermfg=187 +hi Special guifg=#acf0f2 gui=none ctermfg=159 + +" Cursor Colors +hi Cursor guifg=#000000 guibg=#AAF412 +hi iCursor guifg=#000000 guibg=#FDFF00 +hi vCursor guifg=#000000 guibg=#FDFF00