update

3 files changed, 252 insertions, 296 deletions

diff --git a/home/xyz/.config/weechat/irc.conf b/home/xyz/.config/weechat/irc.conf
index 46ee75fa..c1bec192 100644
--- a/home/xyz/.config/weechat/irc.conf
+++ b/home/xyz/.config/weechat/irc.conf
@@ -6,9 +6,11 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/weechat/quickstart/
 #
 
+config_version = 2
+
 [look]
 buffer_open_before_autojoin = on
 buffer_open_before_join = off
@@ -27,6 +29,7 @@ display_ctcp_unknown = on
 display_extended_join = on
 display_host_join = on
 display_host_join_local = on
+display_host_notice = on
 display_host_quit = on
 display_join_message = "329,332,333,366"
 display_old_topic = on
@@ -152,6 +155,7 @@ notify = ""
 password = ""
 proxy = ""
 realname = ""
+registered_mode = "r"
 sasl_fail = reconnect
 sasl_key = ""
 sasl_mechanism = plain
@@ -159,13 +163,13 @@ sasl_password = ""
 sasl_timeout = 15
 sasl_username = ""
 split_msg_max_length = 512
-ssl = off
-ssl_cert = ""
-ssl_dhkey_size = 2048
-ssl_fingerprint = ""
-ssl_password = ""
-ssl_priorities = "NORMAL:-VERS-SSL3.0"
-ssl_verify = on
+tls = off
+tls_cert = ""
+tls_dhkey_size = 2048
+tls_fingerprint = ""
+tls_password = ""
+tls_priorities = "NORMAL:-VERS-SSL3.0"
+tls_verify = on
 usermode = ""
 username = "xyz"
 
@@ -173,13 +177,13 @@ username = "xyz"
 bitlbee.addresses = "localhost/6667"
 bitlbee.proxy
 bitlbee.ipv6
-bitlbee.ssl
-bitlbee.ssl_cert
-bitlbee.ssl_password
-bitlbee.ssl_priorities
-bitlbee.ssl_dhkey_size
-bitlbee.ssl_fingerprint
-bitlbee.ssl_verify
+bitlbee.tls
+bitlbee.tls_cert
+bitlbee.tls_password
+bitlbee.tls_priorities
+bitlbee.tls_dhkey_size
+bitlbee.tls_fingerprint
+bitlbee.tls_verify
 bitlbee.password
 bitlbee.capabilities
 bitlbee.sasl_mechanism
@@ -215,16 +219,17 @@ bitlbee.notify
 bitlbee.split_msg_max_length
 bitlbee.charset_message
 bitlbee.default_chantypes
+bitlbee.registered_mode
 oftc.addresses = "irc.oftc.net/6697"
 oftc.proxy
 oftc.ipv6
-oftc.ssl = on
-oftc.ssl_cert = "${weechat_config_dir}/ssl/ssl.pem"
-oftc.ssl_password
-oftc.ssl_priorities
-oftc.ssl_dhkey_size
-oftc.ssl_fingerprint
-oftc.ssl_verify = on
+oftc.tls = on
+oftc.tls_cert = "${weechat_config_dir}/ssl/ssl.pem"
+oftc.tls_password
+oftc.tls_priorities
+oftc.tls_dhkey_size
+oftc.tls_fingerprint
+oftc.tls_verify = on
 oftc.password
 oftc.capabilities
 oftc.sasl_mechanism
@@ -260,3 +265,4 @@ oftc.notify
 oftc.split_msg_max_length
 oftc.charset_message
 oftc.default_chantypes
+oftc.registered_mode
diff --git a/home/xyz/.config/weechat/trigger.conf b/home/xyz/.config/weechat/trigger.conf
index 486c22e2..bb5e4d7f 100644
--- a/home/xyz/.config/weechat/trigger.conf
+++ b/home/xyz/.config/weechat/trigger.conf
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/weechat/quickstart/
 #
 
 [look]
@@ -22,8 +22,6 @@ flag_return_code = lightmagenta
 identifier = cyan
 regex = white
 replace = cyan
-trigger = green
-trigger_disabled = red
 
 [trigger]
 beep.arguments = ""
diff --git a/home/xyz/.config/weechat/weechat.conf b/home/xyz/.config/weechat/weechat.conf
index 3c489bd3..cb686aee 100644
--- a/home/xyz/.config/weechat/weechat.conf
+++ b/home/xyz/.config/weechat/weechat.conf
@@ -6,9 +6,11 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/weechat/quickstart/
 #
 
+config_version = 2
+
 [debug]
 
 [startup]
@@ -76,6 +78,7 @@ hotlist_suffix = ""
 hotlist_unique_numbers = on
 hotlist_update_on_buffer_switch = on
 input_cursor_scroll = 20
+input_multiline_lead_linebreak = on
 input_share = none
 input_share_overwrite = off
 input_undo_max = 32
@@ -97,7 +100,6 @@ nick_color_hash_salt = ""
 nick_color_stop_chars = "_|["
 nick_prefix = ""
 nick_suffix = ""
-paste_auto_add_newline = on
 paste_bracketed = on
 paste_bracketed_timer_delay = 10
 paste_max_lines = 1
@@ -179,6 +181,8 @@ chat_prefix_suffix = green
 chat_read_marker = magenta
 chat_read_marker_bg = default
 chat_server = brown
+chat_status_disabled = red
+chat_status_enabled = green
 chat_tags = red
 chat_text_found = yellow
 chat_text_found_bg = lightmagenta
@@ -206,7 +210,8 @@ status_filter = green
 status_more = yellow
 status_mouse = green
 status_name = white
-status_name_ssl = lightgreen
+status_name_insecure = lightmagenta
+status_name_tls = white
 status_nicklist_count = default
 status_number = yellow
 status_time = default
@@ -357,52 +362,55 @@ title.type = window
 [filter]
 
 [key]
-ctrl-? = "/input delete_previous_char"
-ctrl-A = "/input move_beginning_of_line"
-ctrl-B = "/input move_previous_char"
-ctrl-C_ = "/input insert \x1F"
-ctrl-Cb = "/input insert \x02"
-ctrl-Cc = "/input insert \x03"
-ctrl-Ci = "/input insert \x1D"
-ctrl-Co = "/input insert \x0F"
-ctrl-Cv = "/input insert \x16"
-ctrl-D = "/input delete_next_char"
-ctrl-E = "/input move_end_of_line"
-ctrl-F = "/input move_next_char"
-ctrl-H = "/input delete_previous_char"
-ctrl-I = "/input complete_next"
-ctrl-J = "/input return"
-ctrl-K = "/input delete_end_of_line"
-ctrl-L = "/window refresh"
-ctrl-M = "/input return"
-ctrl-N = "/buffer +1"
-ctrl-P = "/buffer -1"
-ctrl-R = "/input search_text_here"
-ctrl-Sctrl-U = "/input set_unread"
-ctrl-T = "/input transpose_chars"
-ctrl-U = "/input delete_beginning_of_line"
-ctrl-W = "/input delete_previous_word"
-ctrl-X = "/input switch_active_buffer"
-ctrl-Y = "/input clipboard_paste"
-meta-ctrl-M = "/input insert \n"
-meta-meta-OP = "/bar scroll buflist * b"
-meta-meta-OQ = "/bar scroll buflist * e"
-meta-meta2-11~ = "/bar scroll buflist * b"
-meta-meta2-12~ = "/bar scroll buflist * e"
-meta-meta2-1~ = "/window scroll_top"
-meta-meta2-23~ = "/bar scroll nicklist * b"
-meta-meta2-24~ = "/bar scroll nicklist * e"
-meta-meta2-4~ = "/window scroll_bottom"
-meta-meta2-5~ = "/window scroll_up"
-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-C = "/buffer +1"
-meta-meta2-D = "/buffer -1"
+backspace = "/input delete_previous_char"
+ctrl-_ = "/input undo"
+ctrl-a = "/input move_beginning_of_line"
+ctrl-b = "/input move_previous_char"
+ctrl-c,_ = "/input insert \x1F"
+ctrl-c,b = "/input insert \x02"
+ctrl-c,c = "/input insert \x03"
+ctrl-c,i = "/input insert \x1D"
+ctrl-c,o = "/input insert \x0F"
+ctrl-c,v = "/input insert \x16"
+ctrl-d = "/input delete_next_char"
+ctrl-down = "/input history_global_next"
+ctrl-e = "/input move_end_of_line"
+ctrl-f = "/input move_next_char"
+ctrl-f1 = "/bar scroll buflist * -100%"
+ctrl-f11 = "/bar scroll nicklist * -100%"
+ctrl-f12 = "/bar scroll nicklist * +100%"
+ctrl-f2 = "/bar scroll buflist * +100%"
+ctrl-k = "/input delete_end_of_line"
+ctrl-l = "/window refresh"
+ctrl-left = "/input move_previous_word"
+ctrl-n = "/buffer +1"
+ctrl-p = "/buffer -1"
+ctrl-r = "/input search_text_here"
+ctrl-right = "/input move_next_word"
+ctrl-s,ctrl-u = "/allbuf /buffer set unread"
+ctrl-t = "/input transpose_chars"
+ctrl-u = "/input delete_beginning_of_line"
+ctrl-up = "/input history_global_previous"
+ctrl-w = "/input delete_previous_word"
+ctrl-x = "/buffer switch"
+ctrl-y = "/input clipboard_paste"
+delete = "/input delete_next_char"
+down = "/input history_next"
+end = "/input move_end_of_line"
+f1 = "/bar scroll buflist * -100%"
+f10 = "/bar scroll title * +30%"
+f11 = "/bar scroll nicklist * -100%"
+f12 = "/bar scroll nicklist * +100%"
+f2 = "/bar scroll buflist * +100%"
+f5 = "/buffer -1"
+f6 = "/buffer +1"
+f7 = "/window -1"
+f8 = "/window +1"
+f9 = "/bar scroll title * -30%"
+home = "/input move_beginning_of_line"
+left = "/input move_previous_char"
 meta-- = "/filter toggle @"
-meta-/ = "/input jump_last_buffer_displayed"
+meta-/ = "/buffer jump last_displayed"
 meta-0 = "/buffer *10"
 meta-1 = "/buffer *1"
 meta-2 = "/buffer *2"
@@ -413,246 +421,191 @@ meta-6 = "/buffer *6"
 meta-7 = "/buffer *7"
 meta-8 = "/buffer *8"
 meta-9 = "/buffer *9"
-meta-< = "/input jump_previously_visited_buffer"
+meta-< = "/buffer jump prev_visited"
 meta-= = "/filter toggle"
-meta-> = "/input jump_next_visited_buffer"
+meta-> = "/buffer jump next_visited"
 meta-B = "/buflist toggle"
 meta-N = "/bar toggle nicklist"
-meta-OA = "/input history_global_previous"
-meta-OB = "/input history_global_next"
-meta-OC = "/input move_next_word"
-meta-OD = "/input move_previous_word"
-meta-OF = "/input move_end_of_line"
-meta-OH = "/input move_beginning_of_line"
-meta-OP = "/bar scroll buflist * -100%"
-meta-OQ = "/bar scroll buflist * +100%"
-meta-Oa = "/input history_global_previous"
-meta-Ob = "/input history_global_next"
-meta-Oc = "/input move_next_word"
-meta-Od = "/input move_previous_word"
-meta2-11^ = "/bar scroll buflist * -100%"
-meta2-11~ = "/bar scroll buflist * -100%"
-meta2-12^ = "/bar scroll buflist * +100%"
-meta2-12~ = "/bar scroll buflist * +100%"
-meta2-15~ = "/buffer -1"
-meta2-17~ = "/buffer +1"
-meta2-18~ = "/window -1"
-meta2-19~ = "/window +1"
-meta2-1;3A = "/buffer -1"
-meta2-1;3B = "/buffer +1"
-meta2-1;3C = "/buffer +1"
-meta2-1;3D = "/buffer -1"
-meta2-1;3F = "/window scroll_bottom"
-meta2-1;3H = "/window scroll_top"
-meta2-1;3P = "/bar scroll buflist * b"
-meta2-1;3Q = "/bar scroll buflist * e"
-meta2-1;5A = "/input history_global_previous"
-meta2-1;5B = "/input history_global_next"
-meta2-1;5C = "/input move_next_word"
-meta2-1;5D = "/input move_previous_word"
-meta2-1;5P = "/bar scroll buflist * -100%"
-meta2-1;5Q = "/bar scroll buflist * +100%"
-meta2-1~ = "/input move_beginning_of_line"
-meta2-200~ = "/input paste_start"
-meta2-201~ = "/input paste_stop"
-meta2-20~ = "/bar scroll title * -30%"
-meta2-21~ = "/bar scroll title * +30%"
-meta2-23;3~ = "/bar scroll nicklist * b"
-meta2-23;5~ = "/bar scroll nicklist * -100%"
-meta2-23^ = "/bar scroll nicklist * -100%"
-meta2-23~ = "/bar scroll nicklist * -100%"
-meta2-24;3~ = "/bar scroll nicklist * e"
-meta2-24;5~ = "/bar scroll nicklist * +100%"
-meta2-24^ = "/bar scroll nicklist * +100%"
-meta2-24~ = "/bar scroll nicklist * +100%"
-meta2-3~ = "/input delete_next_char"
-meta2-4~ = "/input move_end_of_line"
-meta2-5;3~ = "/window scroll_up"
-meta2-5~ = "/window page_up"
-meta2-6;3~ = "/window scroll_down"
-meta2-6~ = "/window page_down"
-meta2-7~ = "/input move_beginning_of_line"
-meta2-8~ = "/input move_end_of_line"
-meta2-A = "/input history_previous"
-meta2-B = "/input history_next"
-meta2-C = "/input move_next_char"
-meta2-D = "/input move_previous_char"
-meta2-F = "/input move_end_of_line"
-meta2-G = "/window page_down"
-meta2-H = "/input move_beginning_of_line"
-meta2-I = "/window page_up"
-meta2-Z = "/input complete_previous"
-meta2-[E = "/buffer -1"
 meta-_ = "/input redo"
-meta-a = "/input jump_smart"
+meta-a = "/buffer jump smart"
 meta-b = "/input move_previous_word"
 meta-d = "/input delete_next_word"
+meta-down = "/buffer +1"
+meta-end = "/window scroll_bottom"
 meta-f = "/input move_next_word"
-meta-hmeta-R = "/input hotlist_restore_all"
-meta-hmeta-c = "/input hotlist_clear"
-meta-hmeta-m = "/input hotlist_remove_buffer"
-meta-hmeta-r = "/input hotlist_restore_buffer"
-meta-jmeta-f = "/buffer -"
-meta-jmeta-l = "/buffer +"
-meta-jmeta-r = "/server raw"
-meta-jmeta-s = "/server jump"
-meta-j01 = "/buffer *1"
-meta-j02 = "/buffer *2"
-meta-j03 = "/buffer *3"
-meta-j04 = "/buffer *4"
-meta-j05 = "/buffer *5"
-meta-j06 = "/buffer *6"
-meta-j07 = "/buffer *7"
-meta-j08 = "/buffer *8"
-meta-j09 = "/buffer *9"
-meta-j10 = "/buffer *10"
-meta-j11 = "/buffer *11"
-meta-j12 = "/buffer *12"
-meta-j13 = "/buffer *13"
-meta-j14 = "/buffer *14"
-meta-j15 = "/buffer *15"
-meta-j16 = "/buffer *16"
-meta-j17 = "/buffer *17"
-meta-j18 = "/buffer *18"
-meta-j19 = "/buffer *19"
-meta-j20 = "/buffer *20"
-meta-j21 = "/buffer *21"
-meta-j22 = "/buffer *22"
-meta-j23 = "/buffer *23"
-meta-j24 = "/buffer *24"
-meta-j25 = "/buffer *25"
-meta-j26 = "/buffer *26"
-meta-j27 = "/buffer *27"
-meta-j28 = "/buffer *28"
-meta-j29 = "/buffer *29"
-meta-j30 = "/buffer *30"
-meta-j31 = "/buffer *31"
-meta-j32 = "/buffer *32"
-meta-j33 = "/buffer *33"
-meta-j34 = "/buffer *34"
-meta-j35 = "/buffer *35"
-meta-j36 = "/buffer *36"
-meta-j37 = "/buffer *37"
-meta-j38 = "/buffer *38"
-meta-j39 = "/buffer *39"
-meta-j40 = "/buffer *40"
-meta-j41 = "/buffer *41"
-meta-j42 = "/buffer *42"
-meta-j43 = "/buffer *43"
-meta-j44 = "/buffer *44"
-meta-j45 = "/buffer *45"
-meta-j46 = "/buffer *46"
-meta-j47 = "/buffer *47"
-meta-j48 = "/buffer *48"
-meta-j49 = "/buffer *49"
-meta-j50 = "/buffer *50"
-meta-j51 = "/buffer *51"
-meta-j52 = "/buffer *52"
-meta-j53 = "/buffer *53"
-meta-j54 = "/buffer *54"
-meta-j55 = "/buffer *55"
-meta-j56 = "/buffer *56"
-meta-j57 = "/buffer *57"
-meta-j58 = "/buffer *58"
-meta-j59 = "/buffer *59"
-meta-j60 = "/buffer *60"
-meta-j61 = "/buffer *61"
-meta-j62 = "/buffer *62"
-meta-j63 = "/buffer *63"
-meta-j64 = "/buffer *64"
-meta-j65 = "/buffer *65"
-meta-j66 = "/buffer *66"
-meta-j67 = "/buffer *67"
-meta-j68 = "/buffer *68"
-meta-j69 = "/buffer *69"
-meta-j70 = "/buffer *70"
-meta-j71 = "/buffer *71"
-meta-j72 = "/buffer *72"
-meta-j73 = "/buffer *73"
-meta-j74 = "/buffer *74"
-meta-j75 = "/buffer *75"
-meta-j76 = "/buffer *76"
-meta-j77 = "/buffer *77"
-meta-j78 = "/buffer *78"
-meta-j79 = "/buffer *79"
-meta-j80 = "/buffer *80"
-meta-j81 = "/buffer *81"
-meta-j82 = "/buffer *82"
-meta-j83 = "/buffer *83"
-meta-j84 = "/buffer *84"
-meta-j85 = "/buffer *85"
-meta-j86 = "/buffer *86"
-meta-j87 = "/buffer *87"
-meta-j88 = "/buffer *88"
-meta-j89 = "/buffer *89"
-meta-j90 = "/buffer *90"
-meta-j91 = "/buffer *91"
-meta-j92 = "/buffer *92"
-meta-j93 = "/buffer *93"
-meta-j94 = "/buffer *94"
-meta-j95 = "/buffer *95"
-meta-j96 = "/buffer *96"
-meta-j97 = "/buffer *97"
-meta-j98 = "/buffer *98"
-meta-j99 = "/buffer *99"
+meta-f1 = "/bar scroll buflist * b"
+meta-f11 = "/bar scroll nicklist * b"
+meta-f12 = "/bar scroll nicklist * e"
+meta-f2 = "/bar scroll buflist * e"
+meta-h,meta-R = "/hotlist restore -all"
+meta-h,meta-c = "/hotlist clear"
+meta-h,meta-m = "/hotlist remove"
+meta-h,meta-r = "/hotlist restore"
+meta-home = "/window scroll_top"
+meta-j,0,1 = "/buffer *1"
+meta-j,0,2 = "/buffer *2"
+meta-j,0,3 = "/buffer *3"
+meta-j,0,4 = "/buffer *4"
+meta-j,0,5 = "/buffer *5"
+meta-j,0,6 = "/buffer *6"
+meta-j,0,7 = "/buffer *7"
+meta-j,0,8 = "/buffer *8"
+meta-j,0,9 = "/buffer *9"
+meta-j,1,0 = "/buffer *10"
+meta-j,1,1 = "/buffer *11"
+meta-j,1,2 = "/buffer *12"
+meta-j,1,3 = "/buffer *13"
+meta-j,1,4 = "/buffer *14"
+meta-j,1,5 = "/buffer *15"
+meta-j,1,6 = "/buffer *16"
+meta-j,1,7 = "/buffer *17"
+meta-j,1,8 = "/buffer *18"
+meta-j,1,9 = "/buffer *19"
+meta-j,2,0 = "/buffer *20"
+meta-j,2,1 = "/buffer *21"
+meta-j,2,2 = "/buffer *22"
+meta-j,2,3 = "/buffer *23"
+meta-j,2,4 = "/buffer *24"
+meta-j,2,5 = "/buffer *25"
+meta-j,2,6 = "/buffer *26"
+meta-j,2,7 = "/buffer *27"
+meta-j,2,8 = "/buffer *28"
+meta-j,2,9 = "/buffer *29"
+meta-j,3,0 = "/buffer *30"
+meta-j,3,1 = "/buffer *31"
+meta-j,3,2 = "/buffer *32"
+meta-j,3,3 = "/buffer *33"
+meta-j,3,4 = "/buffer *34"
+meta-j,3,5 = "/buffer *35"
+meta-j,3,6 = "/buffer *36"
+meta-j,3,7 = "/buffer *37"
+meta-j,3,8 = "/buffer *38"
+meta-j,3,9 = "/buffer *39"
+meta-j,4,0 = "/buffer *40"
+meta-j,4,1 = "/buffer *41"
+meta-j,4,2 = "/buffer *42"
+meta-j,4,3 = "/buffer *43"
+meta-j,4,4 = "/buffer *44"
+meta-j,4,5 = "/buffer *45"
+meta-j,4,6 = "/buffer *46"
+meta-j,4,7 = "/buffer *47"
+meta-j,4,8 = "/buffer *48"
+meta-j,4,9 = "/buffer *49"
+meta-j,5,0 = "/buffer *50"
+meta-j,5,1 = "/buffer *51"
+meta-j,5,2 = "/buffer *52"
+meta-j,5,3 = "/buffer *53"
+meta-j,5,4 = "/buffer *54"
+meta-j,5,5 = "/buffer *55"
+meta-j,5,6 = "/buffer *56"
+meta-j,5,7 = "/buffer *57"
+meta-j,5,8 = "/buffer *58"
+meta-j,5,9 = "/buffer *59"
+meta-j,6,0 = "/buffer *60"
+meta-j,6,1 = "/buffer *61"
+meta-j,6,2 = "/buffer *62"
+meta-j,6,3 = "/buffer *63"
+meta-j,6,4 = "/buffer *64"
+meta-j,6,5 = "/buffer *65"
+meta-j,6,6 = "/buffer *66"
+meta-j,6,7 = "/buffer *67"
+meta-j,6,8 = "/buffer *68"
+meta-j,6,9 = "/buffer *69"
+meta-j,7,0 = "/buffer *70"
+meta-j,7,1 = "/buffer *71"
+meta-j,7,2 = "/buffer *72"
+meta-j,7,3 = "/buffer *73"
+meta-j,7,4 = "/buffer *74"
+meta-j,7,5 = "/buffer *75"
+meta-j,7,6 = "/buffer *76"
+meta-j,7,7 = "/buffer *77"
+meta-j,7,8 = "/buffer *78"
+meta-j,7,9 = "/buffer *79"
+meta-j,8,0 = "/buffer *80"
+meta-j,8,1 = "/buffer *81"
+meta-j,8,2 = "/buffer *82"
+meta-j,8,3 = "/buffer *83"
+meta-j,8,4 = "/buffer *84"
+meta-j,8,5 = "/buffer *85"
+meta-j,8,6 = "/buffer *86"
+meta-j,8,7 = "/buffer *87"
+meta-j,8,8 = "/buffer *88"
+meta-j,8,9 = "/buffer *89"
+meta-j,9,0 = "/buffer *90"
+meta-j,9,1 = "/buffer *91"
+meta-j,9,2 = "/buffer *92"
+meta-j,9,3 = "/buffer *93"
+meta-j,9,4 = "/buffer *94"
+meta-j,9,5 = "/buffer *95"
+meta-j,9,6 = "/buffer *96"
+meta-j,9,7 = "/buffer *97"
+meta-j,9,8 = "/buffer *98"
+meta-j,9,9 = "/buffer *99"
+meta-j,meta-f = "/buffer -"
+meta-j,meta-l = "/buffer +"
+meta-j,meta-r = "/server raw"
+meta-j,meta-s = "/server jump"
 meta-k = "/input grab_key_command"
 meta-l = "/window bare"
+meta-left = "/buffer -1"
 meta-m = "/mute mouse toggle"
 meta-n = "/window scroll_next_highlight"
 meta-p = "/window scroll_previous_highlight"
+meta-pgdn = "/window scroll_down"
+meta-pgup = "/window scroll_up"
 meta-r = "/input delete_line"
+meta-return = "/input insert \n"
+meta-right = "/buffer +1"
 meta-s = "/mute spell toggle"
 meta-u = "/window scroll_unread"
-meta-wmeta-meta2-A = "/window up"
-meta-wmeta-meta2-B = "/window down"
-meta-wmeta-meta2-C = "/window right"
-meta-wmeta-meta2-D = "/window left"
-meta-wmeta2-1;3A = "/window up"
-meta-wmeta2-1;3B = "/window down"
-meta-wmeta2-1;3C = "/window right"
-meta-wmeta2-1;3D = "/window left"
-meta-wmeta-b = "/window balance"
-meta-wmeta-s = "/window swap"
-meta-x = "/input zoom_merged_buffer"
+meta-up = "/buffer -1"
+meta-w,meta-b = "/window balance"
+meta-w,meta-down = "/window down"
+meta-w,meta-left = "/window left"
+meta-w,meta-right = "/window right"
+meta-w,meta-s = "/window swap"
+meta-w,meta-up = "/window up"
+meta-x = "/buffer zoom"
 meta-z = "/window zoom"
-ctrl-_ = "/input undo"
+pgdn = "/window page_down"
+pgup = "/window page_up"
+return = "/input return"
+right = "/input move_next_char"
+shift-tab = "/input complete_previous"
+tab = "/input complete_next"
+up = "/input history_previous"
 
 [key_search]
-ctrl-I = "/input search_switch_where"
-ctrl-J = "/input search_stop_here"
-ctrl-M = "/input search_stop_here"
-ctrl-Q = "/input search_stop"
-ctrl-R = "/input search_switch_regex"
-meta2-A = "/input search_previous"
-meta2-B = "/input search_next"
+ctrl-q = "/input search_stop"
+ctrl-r = "/input search_switch_regex"
+down = "/input search_next"
 meta-c = "/input search_switch_case"
+return = "/input search_stop_here"
+tab = "/input search_switch_where"
+up = "/input search_previous"
 
 [key_cursor]
-ctrl-J = "/cursor stop"
-ctrl-M = "/cursor stop"
-meta-meta2-A = "/cursor move area_up"
-meta-meta2-B = "/cursor move area_down"
-meta-meta2-C = "/cursor move area_right"
-meta-meta2-D = "/cursor move area_left"
-meta2-1;3A = "/cursor move area_up"
-meta2-1;3B = "/cursor move area_down"
-meta2-1;3C = "/cursor move area_right"
-meta2-1;3D = "/cursor move area_left"
-meta2-A = "/cursor move up"
-meta2-B = "/cursor move down"
-meta2-C = "/cursor move right"
-meta2-D = "/cursor move left"
 @chat(python.matrix.*):r = "hsignal:matrix_cursor_reply"
+@chat:Q = "hsignal:chat_quote_time_prefix_message;/cursor stop"
+@chat:m = "hsignal:chat_quote_message;/cursor stop"
+@chat:q = "hsignal:chat_quote_prefix_message;/cursor stop"
 @item(buffer_nicklist):K = "/window ${_window_number};/kickban ${nick}"
 @item(buffer_nicklist):b = "/window ${_window_number};/ban ${nick}"
 @item(buffer_nicklist):k = "/window ${_window_number};/kick ${nick}"
 @item(buffer_nicklist):q = "/window ${_window_number};/query ${nick};/cursor stop"
 @item(buffer_nicklist):w = "/window ${_window_number};/whois ${nick}"
-@chat:Q = "hsignal:chat_quote_time_prefix_message;/cursor stop"
-@chat:m = "hsignal:chat_quote_message;/cursor stop"
-@chat:q = "hsignal:chat_quote_prefix_message;/cursor stop"
+down = "/cursor move down"
+left = "/cursor move left"
+meta-down = "/cursor move area_down"
+meta-left = "/cursor move area_left"
+meta-right = "/cursor move area_right"
+meta-up = "/cursor move area_up"
+return = "/cursor stop"
+right = "/cursor move right"
+up = "/cursor move up"
 
 [key_mouse]
+@*:button3 = "/cursor go ${_x},${_y}"
 @bar(buflist):ctrl-wheeldown = "hsignal:buflist_mouse"
 @bar(buflist):ctrl-wheelup = "hsignal:buflist_mouse"
 @bar(input):button2 = "/input grab_mouse_area"
@@ -660,6 +613,8 @@ meta2-D = "/cursor move left"
 @bar(nicklist):button1-gesture-down-long = "/bar scroll nicklist ${_window_number} e"
 @bar(nicklist):button1-gesture-up = "/bar scroll nicklist ${_window_number} -100%"
 @bar(nicklist):button1-gesture-up-long = "/bar scroll nicklist ${_window_number} b"
+@bar:wheeldown = "/bar scroll ${_bar_name} ${_window_number} +20%"
+@bar:wheelup = "/bar scroll ${_bar_name} ${_window_number} -20%"
 @chat(fset.fset):button1 = "/window ${_window_number};/fset -go ${_chat_line_y}"
 @chat(fset.fset):button2* = "hsignal:fset_mouse"
 @chat(fset.fset):wheeldown = "/fset -down 5"
@@ -668,6 +623,15 @@ meta2-D = "/cursor move left"
 @chat(script.scripts):button2 = "/window ${_window_number};/script go ${_chat_line_y};/script installremove -q ${script_name_with_extension}"
 @chat(script.scripts):wheeldown = "/script down 5"
 @chat(script.scripts):wheelup = "/script up 5"
+@chat:button1 = "/window ${_window_number}"
+@chat:button1-gesture-left = "/window ${_window_number};/buffer -1"
+@chat:button1-gesture-left-long = "/window ${_window_number};/buffer 1"
+@chat:button1-gesture-right = "/window ${_window_number};/buffer +1"
+@chat:button1-gesture-right-long = "/window ${_window_number};/buffer +"
+@chat:ctrl-wheeldown = "/window scroll_horiz -window ${_window_number} +10%"
+@chat:ctrl-wheelup = "/window scroll_horiz -window ${_window_number} -10%"
+@chat:wheeldown = "/window scroll_down -window ${_window_number}"
+@chat:wheelup = "/window scroll_up -window ${_window_number}"
 @item(buffer_nicklist):button1 = "/window ${_window_number};/query ${nick}"
 @item(buffer_nicklist):button1-gesture-left = "/window ${_window_number};/kick ${nick}"
 @item(buffer_nicklist):button1-gesture-left-long = "/window ${_window_number};/kickban ${nick}"
@@ -679,15 +643,3 @@ meta2-D = "/cursor move left"
 @item(buflist2):button2* = "hsignal:buflist_mouse"
 @item(buflist3):button1* = "hsignal:buflist_mouse"
 @item(buflist3):button2* = "hsignal:buflist_mouse"
-@bar:wheeldown = "/bar scroll ${_bar_name} ${_window_number} +20%"
-@bar:wheelup = "/bar scroll ${_bar_name} ${_window_number} -20%"
-@chat:button1 = "/window ${_window_number}"
-@chat:button1-gesture-left = "/window ${_window_number};/buffer -1"
-@chat:button1-gesture-left-long = "/window ${_window_number};/buffer 1"
-@chat:button1-gesture-right = "/window ${_window_number};/buffer +1"
-@chat:button1-gesture-right-long = "/window ${_window_number};/input jump_last_buffer"
-@chat:ctrl-wheeldown = "/window scroll_horiz -window ${_window_number} +10%"
-@chat:ctrl-wheelup = "/window scroll_horiz -window ${_window_number} -10%"
-@chat:wheeldown = "/window scroll_down -window ${_window_number}"
-@chat:wheelup = "/window scroll_up -window ${_window_number}"
-@*:button3 = "/cursor go ${_x},${_y}"