# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1377532579 14400
# Node ID 45a5bbee63bd2d3d22f2f3fe153b30b64ff286b1
# Parent  10f4bf76eddda27da7e273fc26a31a96aef97b9d
moare

diff -r 10f4bf76eddd -r 45a5bbee63bd vim/vimrc
--- a/vim/vimrc	Mon Aug 19 15:55:10 2013 -0700
+++ b/vim/vimrc	Mon Aug 26 11:56:19 2013 -0400
@@ -1385,6 +1385,7 @@
 let g:secure_modelines_allowed_items = [
             \ "textwidth",   "tw",
             \ "foldmethod",  "fdm",
+            \ "foldnextmax",  "fdn",
             \ ]
 
 " }}}
diff -r 10f4bf76eddd -r 45a5bbee63bd weechat/weechat.conf
--- a/weechat/weechat.conf	Mon Aug 19 15:55:10 2013 -0700
+++ b/weechat/weechat.conf	Mon Aug 26 11:56:19 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|c2c|arroway)"
+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"