# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1338671545 14400
# Node ID 383c5a5e05232def8540aab9342527adc01fcfb8
# Parent  41b595a4a40f79440971c7bb3ec24e5a41b58ad7# Parent  2090ae1db328e8213eb567f3defc56682f1998bf
Merge.

diff -r 2090ae1db328 -r 383c5a5e0523 .hgtags
--- a/.hgtags	Mon Apr 16 09:47:12 2012 +0200
+++ b/.hgtags	Sat Jun 02 17:12:25 2012 -0400
@@ -3,3 +3,4 @@
 2804e4d33d917aa2251b6d33709d17223fd5e5d0 v1.1.1
 599ba7563aa4251e5f51c3e00ed8c993fe1426c5 v1.1.2
 8c3583c971acda5cb4f034dbe643e5a9315db63b v1.2.0
+4e6ee97af8b02741af86dcb2eb3f0f4dbbcc9761 v1.3.0
diff -r 2090ae1db328 -r 383c5a5e0523 colors/badwolf.vim
--- a/colors/badwolf.vim	Mon Apr 16 09:47:12 2012 +0200
+++ b/colors/badwolf.vim	Sat Jun 02 17:12:25 2012 -0400
@@ -453,6 +453,7 @@
 " Tag names
 call s:HL('htmlTagName',        'coffee', '', 'bold')
 call s:HL('htmlSpecialTagName', 'coffee', '', 'bold')
+call s:HL('htmlSpecialChar',    'lime',   '', 'none')
 
 " Attributes
 call s:HL('htmlArg', 'coffee', '', 'none')
@@ -522,17 +523,24 @@
 call s:HL('markdownCodeBlock', 'dirtyblonde', '', 'none')
 
 " }}}
+" MySQL {{{
+
+call s:HL('mysqlSpecial', 'dress', '', 'bold')
+
+" }}}
 " Python {{{
 
 hi def link pythonOperator Operator
-call s:HL('pythonBuiltin',    'dress')
-call s:HL('pythonBuiltinObj', 'dress')
+call s:HL('pythonBuiltin',     'dress')
+call s:HL('pythonBuiltinObj',  'dress')
 call s:HL('pythonBuiltinFunc', 'dress')
-call s:HL('pythonEscape',     'dress')
-call s:HL('pythonException',  'lime', '', 'bold')
-call s:HL('pythonExceptions', 'lime', '', 'none')
-call s:HL('pythonPrecondit', 'lime', '', 'none')
-call s:HL('pythonDecorator',  'taffy', '', 'none')
+call s:HL('pythonEscape',      'dress')
+call s:HL('pythonException',   'lime', '', 'bold')
+call s:HL('pythonExceptions',  'lime', '', 'none')
+call s:HL('pythonPrecondit',   'lime', '', 'none')
+call s:HL('pythonDecorator',   'taffy', '', 'none')
+call s:HL('pythonRun',         'gravel', '', 'bold')
+call s:HL('pythonCoding',      'gravel', '', 'bold')
 
 " }}}
 " SLIMV {{{
diff -r 2090ae1db328 -r 383c5a5e0523 contrib/badwolf.muttrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/badwolf.muttrc	Sat Jun 02 17:12:25 2012 -0400
@@ -0,0 +1,44 @@
+color normal color15 color233
+color error brightcolor15 color196
+color indicator color15 color235
+color status brightcolor39 color233
+color markers color142 color233
+
+color hdrdefault color245 color233
+color header brightcolor214 color233 "^(Subject): "
+color signature color243 color233
+
+color body color137 color233 [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+
+color body color137 color233 ((https?|ftp)://|www)+[\-\.\;@,/%~_:?&=\#a-zA-Z0-9+]+
+color bold brightcolor15 color233
+color search brightcolor16 color221
+
+color quoted color243 color233
+color quoted1 color211 color233
+color quoted2 color222 color233
+color quoted3 color214 color233
+color quoted4 color154 color233
+
+color tilde color240 color233
+color tree color240 color233
+color attachment brightcolor211 color233
+
+# http://www.mutt.org/doc/manual/manual-4.html#ss4.2
+# color index color241 color233 ~A
+# color index color241 color233 ~Q
+# color index color243 color233 ~P
+color index color221 color233 ~N
+color index brightcolor211 color233 ~F
+color index brightcolor39 color233 ~T
+color index color243 color233 ~Q
+color index color196 color233 ~D
+
+# Colorize inline diffs, really helpful for LKML or other mailing lists where
+# mails frequently include patches.
+color body brightcolor15 color233 '^diff .*'
+color body brightcolor15 color233 '^[Ii]{1}ndex .*'
+color body brightcolor15 color233 '^=+$'
+color body brightcolor15 color233 '^(---|\+\+\+) .*'
+color body brightcolor15 color233 '^@@ .*'
+color body color121 color233 '^\+([^\+].*)?$'
+color body color211 color233 '^-([^-].*)?$'
diff -r 2090ae1db328 -r 383c5a5e0523 package.sh
--- a/package.sh	Mon Apr 16 09:47:12 2012 +0200
+++ b/package.sh	Sat Jun 02 17:12:25 2012 -0400
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-hg archive ~/Desktop/badwolf.zip -I 'colors' -I README.markdown
+hg archive ~/Desktop/badwolf.zip -I 'colors' -I README.markdown -I 'contrib'