# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1276786978 14400
# Node ID 59ffcd8c73daed9fc10175ff7dacea508b340c50
# Parent  985b6818cbfa8137470586fa49d823aca294190b# Parent  8c36821d14d5781ec696ef3b3e62f74d02947819
Merge.

diff -r 985b6818cbfa -r 59ffcd8c73da vim/.gvimrc
--- a/vim/.gvimrc	Wed Jun 16 21:39:31 2010 -0400
+++ b/vim/.gvimrc	Thu Jun 17 11:02:58 2010 -0400
@@ -11,3 +11,7 @@
 let g:sparkupExecuteMapping = '<D-e>'
 
 highlight SpellBad term=underline gui=undercurl guisp=Orange
+highlight LongLine guibg=#343738
+
+" Long lines suck.
+match LongLine '\%>84v.\+'
diff -r 985b6818cbfa -r 59ffcd8c73da vim/.vimrc
--- a/vim/.vimrc	Wed Jun 16 21:39:31 2010 -0400
+++ b/vim/.vimrc	Thu Jun 17 11:02:58 2010 -0400
@@ -151,4 +151,3 @@
 
 " HTML tag closing
 imap <C-_> <Space><BS><Esc>:call InsertCloseTag()<CR>a
-