X-Git-Url: http://pileus.org/git/?p=vpaste;a=blobdiff_plain;f=vimrc;h=ac81a9ed701c6665cc5937e4e20e1fffe1f5633b;hp=fd487fa77bba9f51f50be62383c6c587bf415f3f;hb=HEAD;hpb=572c39c3b4cf45ae8b2619a150f3f770a4c0f8d1

diff --git a/vimrc b/vimrc
index fd487fa..ac81a9e 100644
--- a/vimrc
+++ b/vimrc
@@ -1,14 +1,31 @@
-" Copyright (C) 2009 Andy Spencer - Public domain
+" Andy Spencer 2009-2013 - Public domain
 
+filetype plugin indent on
+syntax on
+
+" Defaults
 set nocompatible
 set encoding=utf-8
-set foldtext=getline(v:foldstart)
+set fileencoding=utf-8
 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 = "^$"
+
+" 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:html_use_xhtml      = 1
+
+" Misc
+let g:is_bash             = 1
 
-let html_use_css = 1
-let html_use_encoding = "utf8"
-"let use_xhtml = 1
+" Override these with modelines
+set nowrap noexpandtab
+au BufWinEnter * let g:html_expand_tabs = &expandtab
+au BufWinEnter * let g:html_pre_wrap    = &wrap