# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1335790188 14400
# Node ID 51c3e81530ad689780d320b7358478639cdeeb30
# Parent  a6ccd64f2e008810250bba1489200d87fb1e7ad3# Parent  9709944e13f27cf26ae4c332d9d281a1acac1753
Merge.

diff -r 9709944e13f2 -r 51c3e81530ad tmux/tmux.conf
--- a/tmux/tmux.conf	Wed Apr 25 15:58:08 2012 +0000
+++ b/tmux/tmux.conf	Mon Apr 30 08:49:48 2012 -0400
@@ -99,6 +99,8 @@
 unbind [
 unbind p
 bind p paste-buffer
+bind -t vi-copy H start-of-line
+bind -t vi-copy L end-of-line
 bind -t vi-copy v begin-selection
 bind -t vi-copy y copy-selection
 bind -t vi-copy Escape cancel
diff -r 9709944e13f2 -r 51c3e81530ad vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Wed Apr 25 15:58:08 2012 +0000
+++ b/vim/custom-dictionary.utf-8.add	Mon Apr 30 08:49:48 2012 -0400
@@ -7,6 +7,7 @@
 Django
 Solr
 Losh
+autogenerated
 Clojure
 offlineimap
 weechat
diff -r 9709944e13f2 -r 51c3e81530ad vim/vimrc
--- a/vim/vimrc	Wed Apr 25 15:58:08 2012 +0000
+++ b/vim/vimrc	Mon Apr 30 08:49:48 2012 -0400
@@ -280,7 +280,10 @@
 nnoremap Vaa ggVG
 
 " Change case
-inoremap <C-u> <esc>gUiwea
+inoremap <C-u> <esc>mzgUiw`za
+
+" Panic Button
+nnoremap <f9> mzggg?G`z
 
 " Emacs bindings in command line mode
 cnoremap <c-a> <home>
diff -r 9709944e13f2 -r 51c3e81530ad weechat/alias.conf
--- a/weechat/alias.conf	Wed Apr 25 15:58:08 2012 +0000
+++ b/weechat/alias.conf	Mon Apr 30 08:49:48 2012 -0400
@@ -7,6 +7,7 @@
 AME = "allchan /me"
 AMSG = "allchan /msg *"
 ANICK = "allserv /nick"
+b = "/buffer"
 BYE = "quit"
 C = "buffer clear"
 CHAT = "dcc chat"