# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1394600181 14400
# Node ID b1920eefa0212c61b0f99ecbcc47eebeb364b2f2
# Parent  a39e48967786ff4d0ebe5639bde1dec455ad0a79# Parent  021398e3fd15394e194f62ae3e0c68555bb7da18
Merge.

diff -r a39e48967786 -r b1920eefa021 .hgsubstate
--- a/.hgsubstate	Wed Mar 12 00:56:02 2014 -0400
+++ b/.hgsubstate	Wed Mar 12 00:56:21 2014 -0400
@@ -39,6 +39,6 @@
 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
 14cb306414dda411b1809a088e18eb2796030095 vim/bundle/syntastic
-ae0c83fe45bcc34becc0e7f79ccc6d458a4274cf vim/bundle/tslime
+113b1f14a1fb92b9c026a71485c9ed402a2045f8 vim/bundle/tslime
 84365f56fc87c11f1f04eed487d256cf8b128f7c vim/bundle/vitality
 a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
diff -r a39e48967786 -r b1920eefa021 gitignore
--- a/gitignore	Wed Mar 12 00:56:02 2014 -0400
+++ b/gitignore	Wed Mar 12 00:56:21 2014 -0400
@@ -4,3 +4,5 @@
 tags2
 tags.bak
 *-SCRATCH.*
+.idea
+*.iml
diff -r a39e48967786 -r b1920eefa021 tmux/tmux.conf
--- a/tmux/tmux.conf	Wed Mar 12 00:56:02 2014 -0400
+++ b/tmux/tmux.conf	Wed Mar 12 00:56:21 2014 -0400
@@ -117,3 +117,5 @@
 bind -t vi-copy Escape cancel
 bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
 
+# Toggle synchronized panes for the current window
+bind S set synchronize-panes
diff -r a39e48967786 -r b1920eefa021 vim/vimrc
--- a/vim/vimrc	Wed Mar 12 00:56:02 2014 -0400
+++ b/vim/vimrc	Wed Mar 12 00:56:21 2014 -0400
@@ -1142,6 +1142,9 @@
 
 augroup END
 
+    " kill pager with q
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>q :call SendToTmuxRaw("q")<cr>
+
 " }}}
 " Puppet {{{
 
diff -r a39e48967786 -r b1920eefa021 weechat/weechat.conf
--- a/weechat/weechat.conf	Wed Mar 12 00:56:02 2014 -0400
+++ b/weechat/weechat.conf	Wed Mar 12 00:56:21 2014 -0400
@@ -36,7 +36,7 @@
 day_change_message_2dates = "-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"
 eat_newline_glitch = off
 highlight = "sjl,slosh,slj,clojerks"
-highlight_regex = "(^all[,:]|backend(ia)?[^s/]|red[- ]tape|steve ?losh|rob ford|(jesus )?fucking christ)"
+highlight_regex = "(^all[,:]|backend(ia)?[^s/]|red[- ]tape|steve ?losh|rob ford|(jesus )?fucking christ|bring me my [A-Za-z0-9_]+ (pant|breeche|kilt|skirt|short|jort|plort)s?)"
 highlight_tags = ""
 hotlist_add_buffer_if_away = on
 hotlist_buffer_separator = ", "