# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1313685289 14400
# Node ID 9cb9df3cc3f10449c19cd766604f92c4f97c880b
# Parent  61543c43271e93574a90f5b826f74a7e1a15cc1d
Minor Vim tweaks.

diff -r 61543c43271e -r 9cb9df3cc3f1 vim/.vimrc
--- a/vim/.vimrc	Wed Aug 17 13:06:46 2011 -0400
+++ b/vim/.vimrc	Thu Aug 18 12:34:49 2011 -0400
@@ -375,11 +375,10 @@
 " HTML and HTMLDjango {{{
 
 au BufNewFile,BufRead *.html setlocal filetype=htmldjango
-au BufNewFile,BufRead *.html setlocal foldmethod=manual
+au FileType html,jinja,htmldjango setlocal foldmethod=manual
 
 " Use <localleader>f to fold the current tag.
-au BufNewFile,BufRead *.html nnoremap <buffer> <localleader>f Vatzf
-au BufNewFile,BufRead *.html nnoremap <buffer> VV vatV
+au FileType html,jinja,htmldjango nnoremap <buffer> <localleader>f Vatzf
 
 " Use Shift-Return to turn this:
 "     <tag>|</tag>
@@ -388,8 +387,7 @@
 "     <tag>
 "         |
 "     </tag>
-au BufNewFile,BufRead *.html inoremap <buffer> <s-cr> <cr><esc>kA<cr>
-au BufNewFile,BufRead *.html nnoremap <buffer> <s-cr> vit<esc>a<cr><esc>vito<esc>i<cr><esc>
+au FileType html,jinja,htmldjango nnoremap <buffer> <s-cr> vit<esc>a<cr><esc>vito<esc>i<cr><esc>
 
 " Django tags
 au FileType jinja,htmldjango inoremap <buffer> <c-t> {%<space><space>%}<left><left><left>
@@ -424,6 +422,7 @@
 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
+au BufRead,BufNewFile vhost.nginx                            set ft=nginx
 
 " }}}
 " Pentadactyl {{{