changeset 260:f3ea51b9b4d1

Upgrade to new Weechat.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 21 Jan 2015 16:50:58 -0800
parents 726728f13152
children 53b522bf4cd4
files weechat/alias.conf weechat/aspell.conf weechat/buffers.conf weechat/charset.conf weechat/irc.conf weechat/iset.conf weechat/logger.conf weechat/relay.conf weechat/script.conf weechat/sec.conf weechat/trigger.conf weechat/weechat.conf weechat/xfer.conf
diffstat 13 files changed, 94 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/weechat/alias.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/alias.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.4.2
+# alias.conf -- weechat v1.1
 #
 
 [cmd]
--- a/weechat/aspell.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/aspell.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v0.4.2
+# aspell.conf -- weechat v1.1
 #
 
 [color]
--- a/weechat/buffers.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/buffers.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.4.2
+# buffers.conf -- weechat v1.1
 #
 
 [color]
--- a/weechat/charset.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/charset.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v0.4.2
+# charset.conf -- weechat v1.1
 #
 
 [default]
--- a/weechat/irc.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/irc.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,8 +1,10 @@
 #
-# irc.conf -- weechat v0.4.2
+# irc.conf -- weechat v1.1
 #
 
 [look]
+buffer_open_before_autojoin = on
+buffer_open_before_join = off
 buffer_switch_autojoin = on
 buffer_switch_join = on
 color_nicks_in_names = off
@@ -24,12 +26,13 @@
 highlight_channel = "$nick"
 highlight_pv = "$nick"
 highlight_server = "$nick"
-highlight_tags = "irc_privmsg,irc_notice"
+highlight_tags_restrict = "irc_privmsg,irc_notice"
 item_away_message = on
-item_channel_modes_hide_key = off
+item_channel_modes_hide_args = "k"
 item_display_server = buffer_plugin
 item_nick_modes = on
 item_nick_prefix = on
+join_auto_add_chantype = off
 msgbuffer_fallback = current
 new_channel_position = none
 new_pv_position = none
@@ -42,6 +45,7 @@
 nicks_hide_password = "nickserv"
 notice_as_pv = auto
 notice_welcome_redirect = on
+notice_welcome_tags = ""
 notify_tags_ison = "notify_message"
 notify_tags_whois = "notify_message"
 part_closes_buffer = off
@@ -53,8 +57,10 @@
 smart_filter_delay = 5
 smart_filter_join = on
 smart_filter_join_unmask = 30
+smart_filter_mode = "+"
 smart_filter_nick = on
 smart_filter_quit = on
+temporary_servers = off
 topic_strip_colors = off
 
 [color]
@@ -63,6 +69,7 @@
 item_channel_modes = default
 item_lag_counting = default
 item_lag_finished = yellow
+item_nick_modes = default
 message_join = green
 message_quit = red
 mirc_remap = "1,-1:darkgray"
@@ -76,9 +83,11 @@
 alternate_nick = on
 autoreconnect_delay_growing = 2
 autoreconnect_delay_max = 1800
+ban_mask_default = "*!$ident@$host"
 colors_receive = on
 colors_send = on
 lag_check = 60
+lag_max = 1800
 lag_min_show = 500
 lag_reconnect = 0
 lag_refresh_interval = 1
@@ -109,15 +118,17 @@
 command = ""
 command_delay = 0
 connection_timeout = 60
+default_msg_kick = ""
 default_msg_part = "WeeChat %v"
 default_msg_quit = "WeeChat %v"
 ipv6 = on
 local_hostname = ""
-nicks = "lordabdul,lordabdul1,lordabdul2,lordabdul3,lordabdul4"
+nicks = "${sec.data.nick},${sec.data.nick}1,${sec.data.nick}2,${sec.data.nick}3,${sec.data.nick}4"
 notify = ""
 password = ""
 proxy = ""
 realname = ""
+sasl_fail = continue
 sasl_mechanism = plain
 sasl_password = ""
 sasl_timeout = 15
@@ -125,6 +136,7 @@
 ssl = off
 ssl_cert = ""
 ssl_dhkey_size = 2048
+ssl_fingerprint = ""
 ssl_priorities = "NORMAL"
 ssl_verify = on
 username = "abdul"
@@ -137,6 +149,7 @@
 freenode.ssl_cert
 freenode.ssl_priorities
 freenode.ssl_dhkey_size
+freenode.ssl_fingerprint
 freenode.ssl_verify
 freenode.password
 freenode.capabilities
@@ -144,10 +157,11 @@
 freenode.sasl_username
 freenode.sasl_password
 freenode.sasl_timeout
+freenode.sasl_fail
 freenode.autoconnect = on
 freenode.autoreconnect
 freenode.autoreconnect_delay
-freenode.nicks = "lordabdul,lordabdul1,lordabdul2,lordabdul3,lordabdul4"
+freenode.nicks
 freenode.username
 freenode.realname
 freenode.local_hostname
@@ -161,6 +175,7 @@
 freenode.anti_flood_prio_low
 freenode.away_check
 freenode.away_check_max_nicks
+freenode.default_msg_kick
 freenode.default_msg_part
 freenode.default_msg_quit
 freenode.notify
@@ -171,6 +186,7 @@
 quakenet.ssl_cert
 quakenet.ssl_priorities
 quakenet.ssl_dhkey_size
+quakenet.ssl_fingerprint
 quakenet.ssl_verify
 quakenet.password
 quakenet.capabilities
@@ -178,10 +194,11 @@
 quakenet.sasl_username
 quakenet.sasl_password
 quakenet.sasl_timeout
+quakenet.sasl_fail
 quakenet.autoconnect = on
 quakenet.autoreconnect
 quakenet.autoreconnect_delay
-quakenet.nicks = "lordabdul,lordabdul2,lordabdul3,lordabdul4"
+quakenet.nicks
 quakenet.username
 quakenet.realname
 quakenet.local_hostname
@@ -195,6 +212,7 @@
 quakenet.anti_flood_prio_low
 quakenet.away_check
 quakenet.away_check_max_nicks
+quakenet.default_msg_kick
 quakenet.default_msg_part
 quakenet.default_msg_quit
 quakenet.notify
@@ -205,6 +223,7 @@
 sorcery.ssl_cert
 sorcery.ssl_priorities
 sorcery.ssl_dhkey_size
+sorcery.ssl_fingerprint
 sorcery.ssl_verify
 sorcery.password
 sorcery.capabilities
@@ -212,10 +231,11 @@
 sorcery.sasl_username
 sorcery.sasl_password
 sorcery.sasl_timeout
+sorcery.sasl_fail
 sorcery.autoconnect = on
 sorcery.autoreconnect
 sorcery.autoreconnect_delay
-sorcery.nicks = "lordabdul,lordabdul2,lordabdul3,lordabdul4"
+sorcery.nicks
 sorcery.username
 sorcery.realname
 sorcery.local_hostname
@@ -229,6 +249,7 @@
 sorcery.anti_flood_prio_low
 sorcery.away_check
 sorcery.away_check_max_nicks
+sorcery.default_msg_kick
 sorcery.default_msg_part
 sorcery.default_msg_quit
 sorcery.notify
@@ -239,6 +260,7 @@
 oftc.ssl_cert
 oftc.ssl_priorities
 oftc.ssl_dhkey_size
+oftc.ssl_fingerprint
 oftc.ssl_verify
 oftc.password
 oftc.capabilities
@@ -246,10 +268,11 @@
 oftc.sasl_username
 oftc.sasl_password
 oftc.sasl_timeout
+oftc.sasl_fail
 oftc.autoconnect
 oftc.autoreconnect
 oftc.autoreconnect_delay
-oftc.nicks = "lordabdul,lordabdul2,lordabdul3,lordabdul4"
+oftc.nicks
 oftc.username
 oftc.realname
 oftc.local_hostname
@@ -263,6 +286,7 @@
 oftc.anti_flood_prio_low
 oftc.away_check
 oftc.away_check_max_nicks
+oftc.default_msg_kick
 oftc.default_msg_part
 oftc.default_msg_quit
 oftc.notify
--- a/weechat/iset.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/iset.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# iset.conf -- weechat v0.4.2
+# iset.conf -- weechat v1.1
 #
 
 [color]
--- a/weechat/logger.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/logger.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.4.2
+# logger.conf -- weechat v1.1
 #
 
 [look]
--- a/weechat/relay.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/relay.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.4.2
+# relay.conf -- weechat v1.1
 #
 
 [look]
@@ -20,11 +20,13 @@
 [network]
 allowed_ips = ""
 bind_address = ""
+clients_purge_delay = 0
 compression_level = 6
 ipv6 = on
 max_clients = 5
 password = ""
 ssl_cert_key = "%h/ssl/relay.pem"
+ssl_priorities = "NORMAL:-VERS-SSL3.0"
 websocket_allowed_origins = ""
 
 [irc]
--- a/weechat/script.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/script.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# script.conf -- weechat v0.4.2
+# script.conf -- weechat v1.1
 #
 
 [look]
@@ -46,3 +46,4 @@
 dir = "%h/script"
 hold = ""
 url = "http://www.weechat.org/files/plugins.xml.gz"
+url_force_https = on
--- a/weechat/sec.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/sec.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -10,10 +10,10 @@
 
 [data]
 __passphrase__ = on
-oftc = "ED9A6D65C0467287C4498BAF4BA8AC9931C199224C371608D2043AD630317E84478D26D4C738252063A98AAEB95B6E19153443BBE5051F6551"
-quakenet = "1010AF3948F072A1A62A5F351B8A06DDC5D15A3CDFF7FB0AB1A71FA34E6D6D2AC8E7C8B5B1D686BDB46C79D30044B7C05A41A6"
-freenode = "1C64A293E23579ECCA2E77A0B330E986BFCE08B88C8B194234B21B8AE7A0845BD324E658E6D7E1C3060291392CD3A7776B1A5F45153E0C"
-pushover.token = "6B96130AE17EF7028B301646C9F32E40B573C0779BA6E2EA48B7C8102D1E8C7AAA314ECC858121FD372708D5E4E645534D837C7EA0B7AF83FA503F42E2FC16BE76741CEDA0569E"
-pushover.user = "A867698EF226C4602FFD86CC4A982DFBD4BB77CD2B5EFE92F7AAF63A56BF7FE0AC62297C3E2833AE078CF44827BD346A790B5B540CC81FD49D02F43DA5D74EABEF79AB2FCF90F1"
-nick = "3E14B50A576C411D115F011CDC784AEBE9D36B3F412614FC71E5EC4FFCE4132C517B19025F76BF4DE43CFA3BA74038DDCB9A"
-sorcery = "5D6220417C744F0992EEF5629CF744400C4F5092EE3CDC0C84B2DB9B1E6992C8B8E9168B676B9B679C9E05F8B360FF56CA13AFB86B61EC"
+oftc = "04913D33CAC6B412B4FE523F43A199BB14CEA17A269C853B9EC3EBE1C420B4FA5D8C955912B00EC4F7B821EF8D022602BD2C4037BEE466A6A0"
+quakenet = "E912E0E14153A3A3CE28F9B891DED60792CDDDC744FACBA6DD0F5E09BC6ADF4AD747620763C1045247DCE02D1B78C44E866329"
+freenode = "194BBD948E007ACF0328844173DCA2EE432CD1C43522DB05F0CC56763FB259C879ED267F18B6D3B978E111D6E2A97DC691BFDAE5A757A0"
+pushover.token = "02C871A35F95D5E83C09F37CA5E9DA53E65A1BF4278C5CE0B13F0C5B2CDAAEAA3D859D332F628A34280ABA22243AA80BF47D48915C8BA15E24B92F2BFA39DB2E60C66122AEF628"
+pushover.user = "215F1EEEE2D585CD44536B28FFB5E613D567D8927C0DCE356944A8B98D80C23F71B1AF84C15E3C7A558975781562F4D7101F4475CA2499603B7DAC75348320DC1E3FFF3A256C85"
+nick = "B2347744DDD8E80B25DBDED1C77D195AECC212811A39D37827BCCF84B05227AAE1D6EFD8039598B62106289FA7FC737D2094"
+sorcery = "06E3057006DEC80107530F835891295F490924C44AAC728A379D94EE2A107B08A3F11044DF074A4C213D90AFC3C93749DD5DD93F8B1E8C"
--- a/weechat/trigger.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/trigger.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -17,31 +17,31 @@
 trigger_disabled = red
 
 [trigger]
-beep.enabled = on
-beep.hook = "print"
 beep.arguments = ""
-beep.conditions = "${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})"
-beep.regex = ""
 beep.command = "/print -beep"
-beep.return_code = "ok"
-cmd_pass.enabled = on
-cmd_pass.hook = "modifier"
+beep.conditions = "${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})"
+beep.enabled = on
+beep.hook = print
+beep.regex = ""
+beep.return_code = ok
 cmd_pass.arguments = "5000|input_text_display;5000|history_add;5000|irc_command_auth"
-cmd_pass.conditions = ""
-cmd_pass.regex = "==^((/(msg|quote) +nickserv +(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|/oper +[^ ]+ +|/quote +pass +|/set +[^ ]*password[^ ]* +|/secure +(passphrase|decrypt|set +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
 cmd_pass.command = ""
-cmd_pass.return_code = ""
-msg_auth.enabled = on
-msg_auth.hook = "modifier"
+cmd_pass.conditions = ""
+cmd_pass.enabled = on
+cmd_pass.hook = modifier
+cmd_pass.regex = "==^((/(msg|quote) +nickserv +(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|/oper +[^ ]+ +|/quote +pass +|/set +[^ ]*password[^ ]* +|/secure +(passphrase|decrypt|set +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
+cmd_pass.return_code = ok
 msg_auth.arguments = "5000|irc_message_auth"
-msg_auth.conditions = ""
-msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
 msg_auth.command = ""
-msg_auth.return_code = ""
-server_pass.enabled = on
-server_pass.hook = "modifier"
+msg_auth.conditions = ""
+msg_auth.enabled = on
+msg_auth.hook = modifier
+msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}"
+msg_auth.return_code = ok
 server_pass.arguments = "5000|input_text_display;5000|history_add"
+server_pass.command = ""
 server_pass.conditions = ""
+server_pass.enabled = on
+server_pass.hook = modifier
 server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==${re:1}${hide:*,${re:4}}${re:5}"
-server_pass.command = ""
-server_pass.return_code = "(null)"
+server_pass.return_code = ok
--- a/weechat/weechat.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/weechat.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v0.4.2
+# weechat.conf -- weechat v1.1
 #
 
 [debug]
@@ -17,7 +17,15 @@
 bar_more_left = "<<"
 bar_more_right = ">>"
 bar_more_up = "--"
+bare_display_exit_on_input = on
+bare_display_time_format = "%H:%M"
+buffer_auto_renumber = on
 buffer_notify_default = all
+buffer_position = end
+buffer_search_case_sensitive = off
+buffer_search_force_default = off
+buffer_search_regex = off
+buffer_search_where = prefix_message
 buffer_time_format = "%H:%M:%S"
 color_basic_force_bold = off
 color_inactive_buffer = on
@@ -30,6 +38,7 @@
 color_pairs_auto_reset = 5
 color_real_white = off
 command_chars = ""
+command_incomplete = off
 confirm_quit = off
 day_change = on
 day_change_message_1date = "-- %a, %d %b %Y --"
@@ -39,7 +48,7 @@
 highlight = ""
 highlight_regex = ""
 highlight_tags = ""
-hotlist_add_buffer_if_away = on
+hotlist_add_conditions = "${away} || ${buffer.num_displayed} == 0"
 hotlist_buffer_separator = ", "
 hotlist_count_max = 2
 hotlist_count_min_msg = 2
@@ -48,6 +57,7 @@
 hotlist_names_level = 12
 hotlist_names_merged_buffers = off
 hotlist_prefix = "H: "
+hotlist_remove = merged
 hotlist_short_names = on
 hotlist_sort = group_time_asc
 hotlist_suffix = ""
@@ -57,6 +67,8 @@
 input_share_overwrite = off
 input_undo_max = 32
 item_buffer_filter = "*"
+item_buffer_zoom = "!"
+item_mouse_status = "M"
 item_time_format = "%H:%M"
 jump_current_to_previous_buffer = on
 jump_previous_buffer_when_closing = on
@@ -96,10 +108,12 @@
 search_text_not_found_alert = on
 separator_horizontal = "-"
 separator_vertical = ""
-set_title = on
+tab_width = 1
 time_format = "%a, %d %b %Y %T"
+window_auto_zoom = off
 window_separator_horizontal = on
 window_separator_vertical = on
+window_title = "WeeChat ${info:version}"
 
 [palette]
 
@@ -161,13 +175,16 @@
 status_data_private = lightgreen
 status_filter = green
 status_more = yellow
+status_mouse = green
 status_name = white
 status_name_ssl = lightgreen
+status_nicklist_count = default
 status_number = yellow
 status_time = default
 
 [completion]
 base_word_until_cursor = on
+command_inline = on
 default_template = "%(nicks)|%(irc_channels)"
 nick_add_space = on
 nick_completer = ":"
@@ -208,7 +225,7 @@
 buffers.conditions = ""
 buffers.filling_left_right = vertical
 buffers.filling_top_bottom = columns_vertical
-buffers.hidden = on
+buffers.hidden = off
 buffers.items = "buffers"
 buffers.position = top
 buffers.priority = 0
@@ -236,7 +253,7 @@
 isetbar.conditions = ""
 isetbar.filling_left_right = vertical
 isetbar.filling_top_bottom = horizontal
-isetbar.hidden = on
+isetbar.hidden = off
 isetbar.items = "isetbar_help"
 isetbar.position = top
 isetbar.priority = 0
@@ -504,6 +521,7 @@
 meta-j98 = "/buffer 98"
 meta-j99 = "/buffer 99"
 meta-k = "/input grab_key_command"
+meta-l = "/window bare 5"
 meta-m = "/mute mouse toggle"
 meta-n = "/window scroll_next_highlight"
 meta-p = "/window scroll_previous_highlight"
--- a/weechat/xfer.conf	Wed Jan 21 16:45:26 2015 -0800
+++ b/weechat/xfer.conf	Wed Jan 21 16:50:58 2015 -0800
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.4.2
+# xfer.conf -- weechat v1.1
 #
 
 [look]
@@ -30,6 +30,7 @@
 auto_accept_chats = off
 auto_accept_files = off
 auto_accept_nicks = ""
+auto_check_crc32 = off
 auto_rename = on
 auto_resume = on
 convert_spaces = on