def83f37f73e
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Mon, 24 Jan 2011 12:02:34 -0500 |
parents | de8edd7538a2 (current diff) d0cba311bdc4 (diff) |
children | 9aba93d73e06 |
branches/tags | (none) |
files | vim/.vimrc |
Changes
--- a/bootstrap.sh Mon Jan 24 12:00:39 2011 -0500 +++ b/bootstrap.sh Mon Jan 24 12:02:34 2011 -0500 @@ -50,7 +50,7 @@ hg clone bb://sjl/hg-prompt/ "$HOME/lib/hg/hg-prompt" hg clone bb://sjl/hg-paste/ "$HOME/lib/hg/hg-paste" -hg clone bb://sjl/hg-review/ "$HOME/lib/hg/hg-review" +hg clone bb://sjl/hg-review/ "$HOME/src/hg/hg-review" hg clone bb://ccaughie/hgcollapse/ "$HOME/lib/hg/hgcollapse" hg clone bb://durin42/histedit/ "$HOME/lib/hg/histedit" hg clone bb://durin42/hg-git/ "$HOME/lib/hg/hg-git"
--- a/mutt/muttrc Mon Jan 24 12:00:39 2011 -0500 +++ b/mutt/muttrc Mon Jan 24 12:02:34 2011 -0500 @@ -6,7 +6,7 @@ set mailcap_path = ~/.mutt/mailcap # entrys for filetypes set signature = ~/.mutt/sig # my signature file set tmpdir = ~/.mutt/temp # where to keep temp files -set editor = "mvim -f +/^$ +:noh" # use vim and skip to first blank line +set editor = "vim +/^$ +:noh" # use vim and skip to first blank line set print_command = /usr/bin/enscript # print with enscript # main options
--- a/vim/.vimrc Mon Jan 24 12:00:39 2011 -0500 +++ b/vim/.vimrc Mon Jan 24 12:02:34 2011 -0500 @@ -31,6 +31,7 @@ set laststatus=2 set undofile set undoreload=10000 +set cpoptions+=J " Status line set statusline=%F%m%r%h%w%=(%{&ff}/%Y)\ (line\ %l\/%L,\ col\ %c) @@ -142,6 +143,8 @@ " Various filetype-specific stuff +au BufNewFile,BufRead *.clj nmap <localleader>ee 0;\et + au BufNewFile,BufRead *.html setlocal filetype=htmldjango au BufNewFile,BufRead *.html setlocal foldmethod=manual au BufNewFile,BufRead *.html nnoremap <buffer> <localleader>f Vatzf