# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1371134708 14400
# Node ID c454b5b4804c6c187f3089b4af0dc3397254f3a8
# Parent  5ddfd5a61ea1d71e97b3a9d7e7be6c4d96f55be3# Parent  63c73a196ade1b128464dad2a0595c6ecc884c21
Merge.

diff -r 63c73a196ade -r c454b5b4804c .hgsubstate
--- a/.hgsubstate	Fri Apr 12 03:35:58 2013 +0100
+++ b/.hgsubstate	Thu Jun 13 10:45:08 2013 -0400
@@ -2,7 +2,7 @@
 b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
-9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
+f183a345a0c10caed7684d07dabae33e007c7590 vim/bundle/ack
 b8e07a24e77d3bad16a89bde409f97ccc307486a vim/bundle/badwolf
 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam
 dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
@@ -29,5 +29,5 @@
 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
 0a7b21d6021a3a565db066e7b8f7f158c918037c vim/bundle/syntastic
 2dee007ddae8156735cbae7f0cd4e0a24ba7287b vim/bundle/tslime
-1dae3b9a0e6fd9d05698bd45d501e232787f317a vim/bundle/vitality
+84365f56fc87c11f1f04eed487d256cf8b128f7c vim/bundle/vitality
 8ebc225b364887c0557ab47ab2ca752a70123bee vim/bundle/yankring
diff -r 63c73a196ade -r c454b5b4804c bin/clean_mail
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/clean_mail	Thu Jun 13 10:45:08 2013 -0400
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+import sys
+
+
+def next_line():
+    l = sys.stdin.readline()
+    if not l:
+        sys.exit(0)
+    return l
+
+# Skip headers
+l = next_line()
+while l.strip():
+    sys.stdout.write(l)
+    l = next_line()
+
+# One blank line in between headers and the start of the message
+while not l.strip():
+    l = next_line()
+
+sys.stdout.write('\n')
+sys.stdout.write(l)
+
+# Dump the rest straight through
+for l in sys.stdin.readlines():
+    sys.stdout.write(l)
+
diff -r 63c73a196ade -r c454b5b4804c dotcss/default.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotcss/default.css	Thu Jun 13 10:45:08 2013 -0400
@@ -0,0 +1,4 @@
+
+*:focus {
+    outline: 4px solid red !important;
+}
diff -r 63c73a196ade -r c454b5b4804c dotcss/news.ycombinator.com.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotcss/news.ycombinator.com.css	Thu Jun 13 10:45:08 2013 -0400
@@ -0,0 +1,2 @@
+
+.subtext > a + a + a { display: none; }
diff -r 63c73a196ade -r c454b5b4804c fish/config.fish
--- a/fish/config.fish	Fri Apr 12 03:35:58 2013 +0100
+++ b/fish/config.fish	Thu Jun 13 10:45:08 2013 -0400
@@ -1,7 +1,7 @@
 # Useful functions {{{
 
 function serve_this; python -m SimpleHTTPServer; end
-# alias fab 'fab -i ~/.ssh/stevelosh'
+function fabric; fab -i ~/.ssh/stevelosh $argv; end
 function oldgcc; set -g CC /usr/bin/gcc-4.0 $argv; end
 function tm; tmux -u2 $argv; end
 function c; clear; end
@@ -24,6 +24,12 @@
 function eg; vim ~/.gitconfig; end
 function es; vim ~/.slate; end
 
+function vup
+    set -x VAGRANT_LOG debug
+    vagrant up $argv
+    set -e VAGRANT_LOG
+end
+
 function fixopenwith
     /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -kill -r -domain local -domain system -domain user
 end
diff -r 63c73a196ade -r c454b5b4804c mutt/muttrc
--- a/mutt/muttrc	Fri Apr 12 03:35:58 2013 +0100
+++ b/mutt/muttrc	Thu Jun 13 10:45:08 2013 -0400
@@ -81,6 +81,8 @@
 set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 alternative_order text/plain text/enriched text/html
 
+set display_filter = "clean_mail" # clean up shitty mail
+
 # }}}
 # Compose View Options {{{
 
@@ -101,6 +103,11 @@
 set forward_quote                    # include message in forwards
 
 # }}}
+# Attachment View Options {{{
+
+set attach_format = "[%D %t] %2n [%-7.7m/%10.10M] %.40d %> [%s] "
+
+# }}}
 # Headers {{{
 
 ignore *                                # ignore all headers
diff -r 63c73a196ade -r c454b5b4804c vim/bundle/django-custom/indent/htmldjango.vim
--- a/vim/bundle/django-custom/indent/htmldjango.vim	Fri Apr 12 03:35:58 2013 +0100
+++ b/vim/bundle/django-custom/indent/htmldjango.vim	Thu Jun 13 10:45:08 2013 -0400
@@ -52,7 +52,7 @@
     let tagend = '.*%}' . '.*'
 
     let blocktags = '\(block\|for\|if\|with\|autoescape\|comment\|filter\|spaceless\)'
-    let midtags = '\(empty\|else\)'
+    let midtags = '\(empty\|else\|elif\)'
 
     let pnb_blockstart = pnb =~# tagstart . blocktags . tagend
     let pnb_blockend   = pnb =~# tagstart . 'end' . blocktags . tagend
diff -r 63c73a196ade -r c454b5b4804c vim/bundle/django-custom/syntax/django.vim
--- a/vim/bundle/django-custom/syntax/django.vim	Fri Apr 12 03:35:58 2013 +0100
+++ b/vim/bundle/django-custom/syntax/django.vim	Thu Jun 13 10:45:08 2013 -0400
@@ -23,7 +23,7 @@
 " syn keyword djangoStatement contained == != < > <= >=
 syn keyword djangoStatement contained and as block endblock by cycle debug else
 syn keyword djangoStatement contained extends filter endfilter firstof for
-syn keyword djangoStatement contained endfor if endif ifchanged endifchanged
+syn keyword djangoStatement contained endfor if elif endif ifchanged endifchanged
 syn keyword djangoStatement contained ifequal endifequal ifnotequal
 syn keyword djangoStatement contained endifnotequal in include load not now or
 syn keyword djangoStatement contained parsed regroup reversed spaceless
diff -r 63c73a196ade -r c454b5b4804c vim/vimrc
--- a/vim/vimrc	Fri Apr 12 03:35:58 2013 +0100
+++ b/vim/vimrc	Thu Jun 13 10:45:08 2013 -0400
@@ -33,7 +33,6 @@
 set undoreload=10000
 set list
 set listchars=tab:▸\ ,eol:¬,extends:❯,precedes:❮
-set shell=/bin/bash\ --login
 set lazyredraw
 set matchtime=3
 set showbreak=↪
@@ -49,6 +48,25 @@
 set spellfile=~/.vim/custom-dictionary.utf-8.add
 set colorcolumn=+1
 
+" Dear /bin/bash: fuck you and your bullshit, arcane command-line behaviour.
+"
+" Basically, I want to set this to a non-login, non-interactive bash shell.
+" Using a login/interactive bash as Vim's 'shell' breaks subtle things, like
+" ack.vim's command-line argument parsing.  However, I *do* want bash to load
+" ~/.bash_profile so my aliases get loaded and such.
+"
+" You might think you could do this with the --init-file command line option,
+" which is used to specify an init file.  Or with --rcfile.  But no, those only
+" get loaded for interactive/login shells.
+"
+" So how do we tell bash to source a goddamned file when it loads?  With an
+" *environment variable*.  Jesus, you have multiple command line options for
+" specifying files to load and none of them work?
+"
+" Computers are bullshit.
+let $BASH_ENV = "~/.bash_profile"
+set shell=/bin/bash
+
 " Don't try to highlight lines longer than 800 characters.
 set synmaxcol=800