# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1276206797 14400
# Node ID 7ee2661d5bd84bb9f70dc1472a8c863bcc672f2d
# Parent  309b770e8a8d4bf269a5a0aa546c194f97f21a97# Parent  181d0ea03b770b7e24eb8a74e33ae1bd8eb7b038
Merge.

diff -r 309b770e8a8d -r 7ee2661d5bd8 vim/.vimrc
--- a/vim/.vimrc	Wed Jun 09 17:53:48 2010 -0400
+++ b/vim/.vimrc	Thu Jun 10 17:53:17 2010 -0400
@@ -91,6 +91,25 @@
 set foldlevelstart=1
 nnoremap <F1> za
 vnoremap <F1> za
+au BufNewFile,BufRead *.html map <leader>ft Vatzf
+
+set foldtext=MyFoldText()
+function! MyFoldText()
+    let line = getline(v:foldstart)
+
+    let nucolwidth = &fdc + &number * &numberwidth
+    let windowwidth = winwidth(0) - nucolwidth - 3
+    let foldedlinecount = v:foldend - v:foldstart
+
+    " expand tabs into spaces
+    let onetab = strpart('          ', 0, &tabstop)
+    let line = substitute(line, '\t', onetab, 'g')
+
+    let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
+    let fillcharcount = windowwidth - len(line) - len(foldedlinecount) - 1
+    return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' '
+endfunction
+
 
 " Fuck you, help key.
 imap <F1> <nop>