# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1289597685 18000
# Node ID e0f13b88e80e6e65d9e57ea9906b5792ef2c940b
# Parent  07cddbf20fb8c5faf7616ae1c7c4070de1edab0a# Parent  80e8bc166d003af6e0805faa82508df1fdef9ecb
Merge.

diff -r 07cddbf20fb8 -r e0f13b88e80e mutt/colors.muttrc
--- a/mutt/colors.muttrc	Fri Nov 12 16:34:38 2010 -0500
+++ b/mutt/colors.muttrc	Fri Nov 12 16:34:45 2010 -0500
@@ -20,6 +20,10 @@
 color body color111 color233 "<URL:[^ ]*>"
 color body color111 color233 "www\\.[-.a-z0-9]+\\.[a-z][a-z][a-z]?([-_./~a-z0-9]+)?"
 color body color111 color233 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+color body brightred color233 "^-.*"
+color body green color233 "^[+].*"
+color body brightwhite color233 "^diff .*"
+color body brightyellow color233 "^@@.*"
 
 # misc body stuff
 color attachment color111 color233
diff -r 07cddbf20fb8 -r e0f13b88e80e vim/syntax/python.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/syntax/python.vim	Fri Nov 12 16:34:45 2010 -0500
@@ -0,0 +1,7 @@
+syn match  pythonBlock		":$" nextgroup=pythonDocString skipempty skipwhite
+syn region pythonDocString	matchgroup=Normal start=+[uU]\='+ end=+'+ skip=+\\\\\|\\'+ contains=pythonEscape,@Spell contained
+syn region pythonDocString	matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape,@Spell contained
+syn region pythonDocString	matchgroup=Normal start=+[uU]\="""+ end=+"""+ contains=pythonEscape,@Spell contained
+syn region pythonDocString	matchgroup=Normal start=+[uU]\='''+ end=+'''+ contains=pythonEscape,@Spell contained
+hi def link pythonDocString	Comment
+