# HG changeset patch # User Steve Losh # Date 1319222909 14400 # Node ID 00cfa7ffb0dd34095f1b64d2e61e223c9276b544 # Parent 7d77a8a00a2b9832b690699e5bbf768e9413ce29 Lots. diff -r 7d77a8a00a2b -r 00cfa7ffb0dd .hgsub --- a/.hgsub Wed Oct 19 14:35:48 2011 -0400 +++ b/.hgsub Fri Oct 21 14:48:29 2011 -0400 @@ -14,7 +14,7 @@ vim/bundle/strftimedammit = [hg]http://bitbucket.org/sjl/strftimedammit.vim/ vim/bundle/easymotion = [git]git://github.com/Lokaltog/vim-easymotion.git vim/bundle/pydoc = [git]git://github.com/sjl/pydoc.vim.git -vim/bundle/command-t = [git]git://github.com/vim-scripts/Command-T.git +vim/bundle/ctrlp = [git]git://github.com/kien/ctrlp.vim.git vim/bundle/vim-orgmode = [git]git://github.com/jceb/vim-orgmode.git vim/bundle/slimv = [hg]http://bitbucket.org/sjl/slimv vim/bundle/threesome = [hg]http://bitbucket.org/sjl/threesome.vim @@ -27,6 +27,7 @@ vim/bundle/hammer = [git]git://github.com/robgleeson/hammer.vim.git vim/bundle/fugitive = [git]git://github.com/tpope/vim-fugitive.git vim/bundle/nosecompiler = [git]git://github.com/olethanh/Vim-nosecompiler.git +vim/bundle/rainbow-parentheses = [git]git://github.com/kien/rainbow_parentheses.vim.git vim/bundle/AnsiEsc.vim = [git]git://github.com/vim-scripts/AnsiEsc.vim.git keymando/Plugins/abbrev = [git]git://github.com/keymando/abbrev.git diff -r 7d77a8a00a2b -r 00cfa7ffb0dd .hgsubstate --- a/.hgsubstate Wed Oct 19 14:35:48 2011 -0400 +++ b/.hgsubstate Fri Oct 21 14:48:29 2011 -0400 @@ -2,7 +2,7 @@ c060c94622e92e091b2c67499fdda16d91b68c01 mercurial/templates d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack -bfdf714f8ea10a6bcba7a1375a5700b11077dcd9 vim/bundle/command-t +8d99466502b40d7a5270abe6d763cf59383f4683 vim/bundle/ctrlp cdecdc56f938840cad250aecd58c1901f04c4d1b vim/bundle/easymotion 1b7e4070f5f7b7522422f5b00a75b323cc314daf vim/bundle/fugitive 91190e67720f852c17602504d5225d4e675b6499 vim/bundle/gundo @@ -14,6 +14,7 @@ 2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler a0831b09f2026c3a3d52e253ffd139fe20a9360a vim/bundle/pydoc +5aa885ece727e8d6e46723a9b9293b08530e7532 vim/bundle/rainbow-parentheses e201d578c03156a3dd7176973f2187f4e957f466 vim/bundle/slimv c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit diff -r 7d77a8a00a2b -r 00cfa7ffb0dd dotcss/khanacademy.org.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dotcss/khanacademy.org.css Fri Oct 21 14:48:29 2011 -0400 @@ -0,0 +1,2 @@ +.video_comments { margin-top: 20px; } +.comments_container .comment { margin-bottom: 20px; } diff -r 7d77a8a00a2b -r 00cfa7ffb0dd vim/.vimrc --- a/vim/.vimrc Wed Oct 19 14:35:48 2011 -0400 +++ b/vim/.vimrc Fri Oct 21 14:48:29 2011 -0400 @@ -62,7 +62,8 @@ set wildignore+=*.pyc " Python byte code set wildignore+=*.spl " compiled spelling word lists set wildignore+=*.sw? " Vim swap files -set wildignore+=*.DS_Store? " OSX bullshit +set wildignore+=*.DS_Store " OSX bullshit +set wildignore+=migrations " Django migrations " }}} " Make Vim able to edit crontab files again. @@ -870,6 +871,12 @@ au FileType htmldjango setlocal commentstring={#\ %s\ #} " }}} +" Ctrl-P {{{ + +let g:ctrlp_map = ',' +let g:ctrlp_working_path_mode = 0 + +" }}} " Easymotion {{{ let g:EasyMotion_do_mapping = 0 @@ -965,6 +972,11 @@ au FileType python noremap dS :call ShowPyDoc('', 1) " }}} +" Rainbox Parentheses {{{ + +nnoremap R :RainbowParenthesesToggle + +" }}} " Rope {{{ let ropevim_enable_shortcuts = 0 @@ -1229,9 +1241,9 @@ set go-=R if has("gui_macvim") - " PeepOpen on OS X, Command-T elsewhere. - macmenu &File.New\ Tab key= - map PeepOpen + " " PeepOpen on OS X, Command-T elsewhere. + " macmenu &File.New\ Tab key= + " map PeepOpen " Use the normal HIG movements, except for M-Up/Down let macvim_skip_cmd_opt_movement = 1 @@ -1256,10 +1268,10 @@ imap inoremap my0c`y else - map :CommandT + " map :CommandT " Dammit, PeepOpen - map gxxxxx PeepOpen + " map gxxxxx PeepOpen end highlight SpellBad term=underline gui=undercurl guisp=Orange @@ -1273,10 +1285,10 @@ set guicursor+=i-ci:ver20-iCursor else " Command-T if we don't have a GUI. - map :CommandT + " map :CommandT " Dammit, PeepOpen - map gxxxxx PeepOpen + " map gxxxxx PeepOpen endif " }}} diff -r 7d77a8a00a2b -r 00cfa7ffb0dd vim/bundle/peepopen/README.md --- a/vim/bundle/peepopen/README.md Wed Oct 19 14:35:48 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -vim-peepopen -============= - -A plugin for the Vim text editor. PeepOpen provides fuzzy search of filenames and paths in a programming project. - -Installation ------------- - -Get the PeepOpen.app and open it at least once to approve the Mac OS X security dialog. - -Standard: - -Copy `peepopen.vim` to your `~/.vim/plugin` directory. - -With Tim Pope's [Pathogen](http://github.com/tpope/vim-pathogen): - -Copy the entire `vim-peepopen` plugin directory to your `~/.vim/bundle` directory. - -Usage ------ - -`p` opens the current project directory with the PeepOpen application. - -Use the [vim-rooter](http://github.com/airblade/vim-rooter) plugin for automatic assignment of the current working directory for projects stored in Git. - -(Leader is mapped to '\' by default) - -Credits -------- - -- Initial Vim Plugin by [Andrew Stewart](http://www.airbladesoftware.com/). -- Some plugin boilerplate from [Rein Henrichs](http://reinh.com/). - diff -r 7d77a8a00a2b -r 00cfa7ffb0dd vim/bundle/peepopen/plugin/peepopen.vim --- a/vim/bundle/peepopen/plugin/peepopen.vim Wed Oct 19 14:35:48 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -" plugin/peepopen.vim -" Author: Geoffrey Grosenbach -" License: MIT License - -" Install this file as plugin/peepopen.vim. - -" If you prefer Command-T, use this snippet in your .gvimrc: - -" if has("gui_macvim") -" macmenu &File.New\ Tab key= -" map PeepOpen -" end - -" ============================================================================ - -" Exit quickly when: -" - this plugin was already loaded (or disabled) -" - when 'compatible' is set -if &cp || exists("g:peepopen_loaded") && g:peepopen_loaded - finish -endif -let g:peepopen_loaded = 1 - -let s:save_cpo = &cpo -set cpo&vim - -function s:LaunchPeepOpenViaVim() - let cwd = getcwd() - silent exe "!open 'peepopen://" . shellescape(cwd) . "?editor=MacVim'" -endfunction - -command! PeepOpen :call LaunchPeepOpenViaVim() - -noremap