4537dbfc929a
Merge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Sat, 22 Jan 2011 12:13:31 -0500 |
| parents | 387e93c23520 (diff) 41980dc5753f (current diff) |
| children | d0cba311bdc4 |
| branches/tags | (none) |
| files | mutt/muttrc vim/.vimrc |
Changes
--- a/bootstrap.sh Tue Jan 18 15:32:53 2011 -0500 +++ b/bootstrap.sh Sat Jan 22 12:13:31 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 Tue Jan 18 15:32:53 2011 -0500 +++ b/mutt/muttrc Sat Jan 22 12:13:31 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 Tue Jan 18 15:32:53 2011 -0500 +++ b/vim/.vimrc Sat Jan 22 12:13:31 2011 -0500 @@ -142,6 +142,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