# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1351358374 14400
# Node ID 4343e98d1a78e4636a6369aeb1856216ef91d0fb
# Parent  9169a378ff4a7d2c4b1fd34824765edb32fb211d# Parent  9ab67e2c62628dbefef4d2be449591cb46eaeed2
Merge.

diff -r 9169a378ff4a -r 4343e98d1a78 .hgsubstate
--- a/.hgsubstate	Sat Oct 27 13:18:06 2012 -0400
+++ b/.hgsubstate	Sat Oct 27 13:19:34 2012 -0400
@@ -20,7 +20,7 @@
 49ae47e66f51c92b0f467f9817d5d8745f627132 vim/bundle/python-mode
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt
-cc25e468dce9703010efe691faa9764bd6577add vim/bundle/slimv
+949c1014e9378fe2654818dbcd936d93e8b6ba7d vim/bundle/slimv
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice
diff -r 9169a378ff4a -r 4343e98d1a78 fish/config.fish
--- a/fish/config.fish	Sat Oct 27 13:18:06 2012 -0400
+++ b/fish/config.fish	Sat Oct 27 13:19:34 2012 -0400
@@ -8,7 +8,6 @@
 alias hl 'less -R'
 alias paththis 'set PATH (pwd) $PATH'
 alias clc './bin/get-last-commit-url.py | pbcopy'
-alias t '~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt'
 
 alias swank 'dtach -A /tmp/dtach-swank.sock -r winch lein swank'
 
@@ -97,6 +96,13 @@
     end
 end
 
+alias count_t_tasks '~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt | wc -l'
+set -g T_TASK_COUNT (count_t_tasks)
+function t
+    ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt $argv
+    set -g T_TASK_COUNT (count_t_tasks)
+end
+
 # }}}
 # Bind Keys {{{
 
@@ -231,6 +237,8 @@
 
     virtualenv_prompt
 
+    printf "(%d) " $T_TASK_COUNT
+
     if test $last_status -eq 0
         set_color white -o
         printf '><((°> '
diff -r 9169a378ff4a -r 4343e98d1a78 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Sat Oct 27 13:18:06 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add	Sat Oct 27 13:19:34 2012 -0400
@@ -92,3 +92,5 @@
 bikesheds
 inbox
 iPhone
+monospaced
+programatically
diff -r 9169a378ff4a -r 4343e98d1a78 vim/vimrc
--- a/vim/vimrc	Sat Oct 27 13:18:06 2012 -0400
+++ b/vim/vimrc	Sat Oct 27 13:19:34 2012 -0400
@@ -338,10 +338,6 @@
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>
 
-" Back find-repeat
-" TODO: Why does this not work?
-nnoremap … dd
-
 " Marks and Quotes
 noremap ' `
 noremap æ '
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/alias.conf
--- a/weechat/alias.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/alias.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.3.7
+# alias.conf -- WeeChat v0.3.8
 #
 
 [cmd]
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/buffers.conf
--- a/weechat/buffers.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/buffers.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.3.7
+# buffers.conf -- WeeChat v0.3.8
 #
 
 [color]
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/logger.conf
--- a/weechat/logger.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/logger.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,10 +1,14 @@
 #
-# logger.conf -- weechat v0.3.7
+# logger.conf -- WeeChat v0.3.8
 #
 
 [look]
 backlog = 20
 
+[color]
+backlog_end = darkgray
+backlog_line = darkgray
+
 [file]
 auto_log = on
 flush_delay = 120
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/plugins.conf
--- a/weechat/plugins.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/plugins.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v0.3.7
+# plugins.conf -- WeeChat v0.3.8
 #
 
 [var]
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/relay.conf
--- a/weechat/relay.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/relay.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.3.7
+# relay.conf -- WeeChat v0.3.8
 #
 
 [look]
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/rmodifier.conf
--- a/weechat/rmodifier.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/rmodifier.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# rmodifier.conf -- weechat v0.3.7
+# rmodifier.conf -- WeeChat v0.3.8
 #
 
 [look]
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/urlgrab.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.3.7
+# urlgrab.conf -- WeeChat v0.3.8
 #
 
 [color]
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/weechat.conf
--- a/weechat/weechat.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/weechat.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v0.3.7
+# weechat.conf -- WeeChat v0.3.8
 #
 
 [debug]
@@ -58,19 +58,22 @@
 mouse_timer_delay = 100
 nickmode = on
 nickmode_empty = off
+paste_bracketed = off
+paste_bracketed_timer_delay = 10
 paste_max_lines = 3
 prefix_action = " *"
 prefix_align = right
 prefix_align_max = 15
 prefix_align_min = 0
-prefix_align_more = on
+prefix_align_more = "+"
 prefix_buffer_align = right
 prefix_buffer_align_max = 0
-prefix_buffer_align_more = on
+prefix_buffer_align_more = "+"
 prefix_error = "=!="
 prefix_join = "✔"
 prefix_network = "--"
 prefix_quit = "✘"
+prefix_same_nick = ""
 prefix_suffix = "|"
 read_marker = line
 read_marker_always_show = on
@@ -166,6 +169,7 @@
 [proxy]
 
 [network]
+connection_timeout = 60
 gnutls_ca_file = "%h/ssl/CAs.pem"
 gnutls_handshake_timeout = 30
 
diff -r 9169a378ff4a -r 4343e98d1a78 weechat/xfer.conf
--- a/weechat/xfer.conf	Sat Oct 27 13:18:06 2012 -0400
+++ b/weechat/xfer.conf	Sat Oct 27 13:19:34 2012 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.3.7
+# xfer.conf -- WeeChat v0.3.8
 #
 
 [look]