Fix html, update vimrc

[vpaste] / vimrc

diff --git a/vimrc b/vimrc
index 83f17ea9b98649589248075d39f55fdacf62c6bd..79db8752cbb6e78fc0bf3fae2fb760ece3a80330 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,9 @@
 " Andy Spencer 2009-2011 - Public domain
 
+filetype plugin indent on
+syntax on
+
+" Defaults
 set nocompatible
 set encoding=utf-8
 set fileencoding=utf-8
@@ -7,15 +11,17 @@ set term=xterm-256color
 set modelines=10
 set background=light
 
-filetype plugin indent on
-syntax on
-"colorscheme grey
+" Xterm settings
+let g:xterm_trim_escapes  = 1
+let g:xterm_start_pattern = "^$"
 
-let g:html_use_css = 1
-let g:html_use_encoding = "UTF-8"
-let g:html_no_progress = 1
-let g:html_dynamic_folds = 1
-"let g:html_use_xhtml = 1
+" TOhtml settings
+let g:html_use_css        = 1
+let g:html_use_encoding   = "UTF-8"
+let g:html_no_progress    = 1
+let g:html_dynamic_folds  = 1
 
-let g:xterm_trim_escapes = 1
-let g:xterm_start_pattern = "^$"
+" Override these with modelines
+set nowrap noexpandtab
+au BufWinEnter * let g:html_expand_tabs = &expandtab
+au BufWinEnter * let g:html_pre_wrap    = &wrap