# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1377561757 14400
# Node ID fb9ef461ca17394c0445235426dd9864db51f81f
# Parent  ccd32f66c9fce8a90107ae98c02c745e59d4aa58# Parent  45a5bbee63bd2d3d22f2f3fe153b30b64ff286b1
Merge.

diff -r ccd32f66c9fc -r fb9ef461ca17 .hgsub
--- a/.hgsub	Mon Aug 26 20:02:18 2013 -0400
+++ b/.hgsub	Mon Aug 26 20:02:37 2013 -0400
@@ -2,6 +2,7 @@
 mercurial/histedit               = [hg]https://bitbucket.org/durin42/histedit
 mercurial/templates              = [hg]https://bitbucket.org/sjl/mercurial-cli-templates
 vim/bundle/AnsiEsc.vim           = [git]git://github.com/sjl/AnsiEsc.vim.git
+vim/bundle/abolish               = [git]git://github.com/tpope/vim-abolish.git
 vim/bundle/ack                   = [git]git://github.com/mileszs/ack.vim.git
 vim/bundle/badwolf               = [hg]https://bitbucket.org/sjl/badwolf/
 vim/bundle/clam                  = [hg]https://bitbucket.org/sjl/clam.vim/
@@ -28,6 +29,7 @@
 vim/bundle/repeat                = [git]git://github.com/tpope/vim-repeat.git
 vim/bundle/scala                 = [git]git://github.com/sjl/vim-scala.git
 vim/bundle/scaladoc              = [git]git://github.com/sjl/vim-scaladoc.git
+vim/bundle/securemodelines       = [git]git://github.com/ciaranm/securemodelines.git
 vim/bundle/smartinput            = [git]git://github.com/kana/vim-smartinput.git
 vim/bundle/sparkup               = [git]git://github.com/sjl/vim-sparkup.git
 vim/bundle/splice                = [hg]https://bitbucket.org/sjl/splice.vim
diff -r ccd32f66c9fc -r fb9ef461ca17 .hgsubstate
--- a/.hgsubstate	Mon Aug 26 20:02:18 2013 -0400
+++ b/.hgsubstate	Mon Aug 26 20:02:37 2013 -0400
@@ -2,6 +2,7 @@
 b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
+d64ce06650cf9b098b5a01c0db53864965d9310b vim/bundle/abolish
 f183a345a0c10caed7684d07dabae33e007c7590 vim/bundle/ack
 db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf
 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam
@@ -28,6 +29,7 @@
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 cfc1a90540f648492086a20e39fde7514c469fa7 vim/bundle/scala
 1f797fda2c457202cf62d9a082a3fccd4278e3bf vim/bundle/scaladoc
+10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 01e68795c7a14b97ec2ebbd70b0fcb42d1adac61 vim/bundle/splice
diff -r ccd32f66c9fc -r fb9ef461ca17 dotjs/github.com.js
--- a/dotjs/github.com.js	Mon Aug 26 20:02:18 2013 -0400
+++ b/dotjs/github.com.js	Mon Aug 26 20:02:37 2013 -0400
@@ -1,9 +0,0 @@
-$(function() {
-    $('#top_search_form').attr('action', 'https://google.com/search').submit(function(e) {
-       var q = $('#js-command-bar-field').val();
-       $('#js-command-bar-field').val(q + " site:github.com");
-       e.stopPropagation();
-       return false;
-    });
-
-});
diff -r ccd32f66c9fc -r fb9ef461ca17 fish/config.fish
--- a/fish/config.fish	Mon Aug 26 20:02:18 2013 -0400
+++ b/fish/config.fish	Mon Aug 26 20:02:37 2013 -0400
@@ -48,10 +48,6 @@
     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
-
 function ss; bcvi --wrap-ssh -- $argv; end
 function bcvid; dtach -A /tmp/bcvi.socket bcvi --listener; end
 
@@ -87,7 +83,7 @@
     python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])" $argv
 end
 
-function fix_open_with -d "Fix the shitty OS X Open With menu duplicates"
+function fixopenwith -d "Fix the shitty OS X Open With menu duplicates"
     /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -kill -r -domain local -domain user
     killall Finder
     echo "Open With has been rebuilt, Finder will relaunch"
diff -r ccd32f66c9fc -r fb9ef461ca17 vim/vimrc
--- a/vim/vimrc	Mon Aug 26 20:02:18 2013 -0400
+++ b/vim/vimrc	Mon Aug 26 20:02:37 2013 -0400
@@ -1386,6 +1386,15 @@
 nnoremap <silent> <leader><tab> :ScratchToggle<cr>
 
 " }}}
+" Secure Modelines {{{
+
+let g:secure_modelines_allowed_items = [
+            \ "textwidth",   "tw",
+            \ "foldmethod",  "fdm",
+            \ "foldnextmax",  "fdn",
+            \ ]
+
+" }}}
 " Sparkup {{{
 
 let g:sparkupNextMapping = '<c-s>'
diff -r ccd32f66c9fc -r fb9ef461ca17 weechat/python/autoload/growl.py
--- a/weechat/python/autoload/growl.py	Mon Aug 26 20:02:18 2013 -0400
+++ b/weechat/python/autoload/growl.py	Mon Aug 26 20:02:37 2013 -0400
@@ -415,7 +415,7 @@
                          '-I', STATE['icon'],
                          '-m', description,
                          '-d', notification,
-                         '-p', priority or '0',
+                         '-p', str(priority) or '0',
                          '-t', title])
     except Exception as error:
         weechat.prnt('', 'growl: {0}'.format(error))
diff -r ccd32f66c9fc -r fb9ef461ca17 weechat/weechat.conf
--- a/weechat/weechat.conf	Mon Aug 26 20:02:18 2013 -0400
+++ b/weechat/weechat.conf	Mon Aug 26 20:02:37 2013 -0400
@@ -35,7 +35,7 @@
 day_change_time_format = "%a, %d %b %Y"
 eat_newline_glitch = off
 highlight = "sjl"
-highlight_regex = "(sjl|^all[,:]|backend(ia?)|slosh|slj|clojerks|red[- ]tape)"
+highlight_regex = "(sjl|^all[,:]|backend(ia)?[^/]|slosh|slj|clojerks|red[- ]tape|c2c|arroway|[mM]oney ?[dD]rop)"
 highlight_tags = ""
 hotlist_add_buffer_if_away = on
 hotlist_buffer_separator = ", "
@@ -265,6 +265,40 @@
 title.type = window
 
 [layout]
+main.buffer = "core;weechat;1"
+main.buffer = "irc;server.simple;1"
+main.buffer = "irc;server.sjl;1"
+main.buffer = "irc;server.bit;1"
+main.buffer = "irc;simple.#simple;2"
+main.buffer = "irc;simple.#engineering;3"
+main.buffer = "irc;simple.#backend;4"
+main.buffer = "irc;simple.##/b/anksimple;5"
+main.buffer = "irc;simple.#c2c;6"
+main.buffer = "irc;simple.#ops;7"
+main.buffer = "irc;simple.#security;8"
+main.buffer = "irc;simple.##@;9"
+main.buffer = "irc;simple.#support;10"
+main.buffer = "irc;simple.##vim;11"
+main.buffer = "irc;simple.##dance;12"
+main.buffer = "irc;simple.##adorbs;13"
+main.buffer = "irc;sjl.##simple;14"
+main.buffer = "irc;simple.##portland;15"
+main.buffer = "irc;simple.##music;16"
+main.buffer = "irc;bit.&bitlbee;17"
+main.buffer = "irc;sjl.#riemann;18"
+main.buffer = "irc;sjl.#mercurial;19"
+main.buffer = "irc;sjl.#clojure;20"
+main.buffer = "irc;sjl.#weechat;21"
+main.buffer = "irc;sjl.#mutt;22"
+main.buffer = "irc;sjl.#nethack;23"
+main.buffer = "irc;sjl.#dwarffortress;24"
+main.buffer = "irc;sjl.#scala;25"
+main.buffer = "irc;sjl.#lisp;26"
+main.buffer = "irc;sjl.#vagrant;27"
+main.buffer = "irc;sjl.#amara_alumni;28"
+main.buffer = "irc;sjl.#postgresql;29"
+main.window = "1;0;0;0;irc;simple.##music"
+main.current = on
 
 [notify]
 
@@ -287,7 +321,7 @@
 ctrl-F = "/input move_next_char"
 ctrl-H = "/input delete_previous_char"
 ctrl-I = "/input complete_next"
-ctrl-J = "/input return"
+ctrl-J = "/buffer move +1"
 ctrl-K = "/input delete_end_of_line"
 ctrl-L = "/window refresh"
 ctrl-M = "/input return"
@@ -308,8 +342,8 @@
 meta-meta2-6~ = "/window scroll_down"
 meta-meta2-7~ = "/window scroll_top"
 meta-meta2-8~ = "/window scroll_bottom"
-meta-meta2-A = "/buffer -1"
-meta-meta2-B = "/buffer +1"
+meta-meta2-A = "/buffer move -1"
+meta-meta2-B = "/buffer move +1"
 meta-meta2-C = "/buffer +1"
 meta-meta2-D = "/buffer -1"
 meta-0 = "/buffer *10"