# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1335884778 14400
# Node ID 7004f9ab85b413e17d50bd25dcb764c0987c1e83
# Parent  8f241cb010bdd9adbe38d2d070800fbc0db82478# Parent  51c3e81530ad689780d320b7358478639cdeeb30
Merge.

diff -r 8f241cb010bd -r 7004f9ab85b4 tmux/tmux.conf
--- a/tmux/tmux.conf	Tue May 01 11:05:42 2012 -0400
+++ b/tmux/tmux.conf	Tue May 01 11:06:18 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 8f241cb010bd -r 7004f9ab85b4 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Tue May 01 11:05:42 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add	Tue May 01 11:06:18 2012 -0400
@@ -7,6 +7,7 @@
 Django
 Solr
 Losh
+autogenerated
 Clojure
 offlineimap
 weechat
diff -r 8f241cb010bd -r 7004f9ab85b4 vim/vimrc
--- a/vim/vimrc	Tue May 01 11:05:42 2012 -0400
+++ b/vim/vimrc	Tue May 01 11:06:18 2012 -0400
@@ -283,7 +283,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 8f241cb010bd -r 7004f9ab85b4 weechat/alias.conf
--- a/weechat/alias.conf	Tue May 01 11:05:42 2012 -0400
+++ b/weechat/alias.conf	Tue May 01 11:06:18 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"