weechat: import all changes

11 files changed, 252 insertions, 116 deletions

diff --git a/weechat/aspell.conf b/weechat/aspell.conf
index 3b3ddbd..d8b932f 100644
--- a/weechat/aspell.conf
+++ b/weechat/aspell.conf
@@ -2,6 +2,10 @@
 # aspell.conf -- weechat v1.1-dev
 #
 
+[color]
+misspelled = lightred
+suggestions = default
+
 [check]
 commands = "ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"
 default_dict = "en"
@@ -11,10 +15,6 @@ real_time = on
 suggestions = 0
 word_min_length = 2
 
-[color]
-misspelled = lightred
-suggestions = default
-
 [dict]
 core.weechat = "en"
 
diff --git a/weechat/buffers.conf b/weechat/buffers.conf
index a9d69d5..eb06229 100644
--- a/weechat/buffers.conf
+++ b/weechat/buffers.conf
@@ -54,6 +54,7 @@ indenting_number = on
 jump_prev_next_visited_buffer = off
 mark_inactive = on
 mouse_move_buffer = on
+mouse_wheel = on
 name_crop_suffix = "×"
 name_size_max = 0
 number_char = "."
diff --git a/weechat/charset.conf b/weechat/charset.conf
index 423e4a8..ef949ad 100644
--- a/weechat/charset.conf
+++ b/weechat/charset.conf
@@ -2,10 +2,10 @@
 # charset.conf -- weechat v1.1-dev
 #
 
-[decode]
-
 [default]
 decode = "iso-8859-1"
 encode = "UTF-8"
 
+[decode]
+
 [encode]
diff --git a/weechat/exec.conf b/weechat/exec.conf
index 2fc4896..e779bb5 100644
--- a/weechat/exec.conf
+++ b/weechat/exec.conf
@@ -2,10 +2,10 @@
 # exec.conf -- weechat v1.1-dev
 #
 
-[color]
-flag_finished = lightred
-flag_running = lightgreen
-
 [command]
 default_options = ""
 purge_delay = 0
+
+[color]
+flag_finished = lightred
+flag_running = lightgreen
diff --git a/weechat/irc.conf b/weechat/irc.conf
index 18f129f..3050d3f 100644
--- a/weechat/irc.conf
+++ b/weechat/irc.conf
@@ -2,27 +2,9 @@
 # irc.conf -- weechat v1.1-dev
 #
 
-[color]
-input_nick = lightcyan
-item_away = yellow
-item_channel_modes = default
-item_lag_counting = default
-item_lag_finished = yellow
-item_nick_modes = default
-message_join = green
-message_quit = lightred
-mirc_remap = "1,-1:darkgray"
-nick_prefixes = "q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"
-notice = blue
-reason_quit = default
-topic_new = white
-topic_old = darkgray
-
-[ctcp]
-
-[ignore]
-
 [look]
+buffer_open_before_autojoin = on
+buffer_open_before_join = off
 buffer_switch_autojoin = off
 buffer_switch_join = on
 color_nicks_in_names = on
@@ -75,13 +57,27 @@ smart_filter = on
 smart_filter_delay = 5
 smart_filter_join = on
 smart_filter_join_unmask = 30
-smart_filter_mode = ""
+smart_filter_mode = "v"
 smart_filter_nick = on
 smart_filter_quit = on
-temporary_servers = off
+temporary_servers = on
 topic_strip_colors = off
 
-[msgbuffer]
+[color]
+input_nick = lightcyan
+item_away = yellow
+item_channel_modes = default
+item_lag_counting = default
+item_lag_finished = yellow
+item_nick_modes = default
+message_join = green
+message_quit = lightred
+mirc_remap = "1,-1:darkgray"
+nick_prefixes = "q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"
+notice = blue
+reason_quit = default
+topic_new = white
+topic_old = darkgray
 
 [network]
 alternate_nick = on
@@ -100,6 +96,52 @@ notify_check_whois = 5
 send_unknown_commands = off
 whois_double_nick = off
 
+[msgbuffer]
+
+[ctcp]
+version = "WeeChat $versiongit ($compilation) ($osinfo)"
+
+[ignore]
+
+[server_default]
+addresses = "theos.kyriasis.com/6697"
+anti_flood_prio_high = 2
+anti_flood_prio_low = 2
+autoconnect = off
+autojoin = ""
+autoreconnect = on
+autoreconnect_delay = 10
+autorejoin = off
+autorejoin_delay = 30
+away_check = 0
+away_check_max_nicks = 0
+capabilities = "away-notify,extended-join,multi-prefix,userhost-in-names,server-time,znc.in/server-time-iso"
+command = ""
+command_delay = 0
+connection_timeout = 60
+default_msg_kick = ""
+default_msg_part = ""
+default_msg_quit = ""
+ipv6 = on
+local_hostname = ""
+nicks = "demize,remize,dem,kyrias"
+notify = ""
+password = ""
+proxy = ""
+realname = "Johannes Löthberg"
+sasl_fail = continue
+sasl_mechanism = plain
+sasl_password = ""
+sasl_timeout = 15
+sasl_username = ""
+ssl = on
+ssl_cert = "%h/keys/demize.pem"
+ssl_dhkey_size = 512
+ssl_fingerprint = ""
+ssl_priorities = "NORMAL"
+ssl_verify = on
+username = "dem"
+
 [server]
 Freenode.addresses
 Freenode.proxy
@@ -116,6 +158,7 @@ Freenode.sasl_mechanism
 Freenode.sasl_username
 Freenode.sasl_password
 Freenode.sasl_timeout
+Freenode.sasl_fail
 Freenode.autoconnect = on
 Freenode.autoreconnect
 Freenode.autoreconnect_delay
@@ -152,6 +195,7 @@ Furnet.sasl_mechanism
 Furnet.sasl_username
 Furnet.sasl_password
 Furnet.sasl_timeout
+Furnet.sasl_fail
 Furnet.autoconnect = on
 Furnet.autoreconnect
 Furnet.autoreconnect_delay
@@ -188,6 +232,7 @@ Foonetic.sasl_mechanism
 Foonetic.sasl_username
 Foonetic.sasl_password
 Foonetic.sasl_timeout
+Foonetic.sasl_fail
 Foonetic.autoconnect = on
 Foonetic.autoreconnect
 Foonetic.autoreconnect_delay
@@ -224,6 +269,7 @@ Therian.sasl_mechanism
 Therian.sasl_username
 Therian.sasl_password
 Therian.sasl_timeout
+Therian.sasl_fail
 Therian.autoconnect = on
 Therian.autoreconnect
 Therian.autoreconnect_delay
@@ -260,6 +306,7 @@ Mozilla.sasl_mechanism
 Mozilla.sasl_username
 Mozilla.sasl_password
 Mozilla.sasl_timeout
+Mozilla.sasl_fail
 Mozilla.autoconnect = on
 Mozilla.autoreconnect
 Mozilla.autoreconnect_delay
@@ -281,41 +328,40 @@ Mozilla.default_msg_kick
 Mozilla.default_msg_part
 Mozilla.default_msg_quit
 Mozilla.notify
-
-[server_default]
-addresses = "theos.kyriasis.com/6697"
-anti_flood_prio_high = 2
-anti_flood_prio_low = 2
-autoconnect = off
-autojoin = ""
-autoreconnect = on
-autoreconnect_delay = 10
-autorejoin = off
-autorejoin_delay = 30
-away_check = 0
-away_check_max_nicks = 0
-capabilities = "multi-prefix,userhost-in-names,znc.in/server-time-iso"
-command = ""
-command_delay = 0
-connection_timeout = 60
-default_msg_kick = ""
-default_msg_part = ""
-default_msg_quit = ""
-ipv6 = on
-local_hostname = ""
-nicks = "demize,remize,dem,kyrias"
-notify = ""
-password = ""
-proxy = ""
-realname = "Johannes Löthberg"
-sasl_mechanism = plain
-sasl_password = ""
-sasl_timeout = 15
-sasl_username = ""
-ssl = on
-ssl_cert = "%h/keys/demize.pem"
-ssl_dhkey_size = 2048
-ssl_fingerprint = ""
-ssl_priorities = "NORMAL"
-ssl_verify = on
-username = "dem"
+ogamenet.addresses = "irc.ogamenet.net/6697"
+ogamenet.proxy
+ogamenet.ipv6
+ogamenet.ssl
+ogamenet.ssl_cert
+ogamenet.ssl_priorities
+ogamenet.ssl_dhkey_size
+ogamenet.ssl_fingerprint = "03b6d674d5f147e3f4cb04a5e92a88f454f4db48"
+ogamenet.ssl_verify
+ogamenet.password
+ogamenet.capabilities
+ogamenet.sasl_mechanism
+ogamenet.sasl_username
+ogamenet.sasl_password
+ogamenet.sasl_timeout
+ogamenet.sasl_fail
+ogamenet.autoconnect
+ogamenet.autoreconnect
+ogamenet.autoreconnect_delay
+ogamenet.nicks
+ogamenet.username
+ogamenet.realname
+ogamenet.local_hostname
+ogamenet.command
+ogamenet.command_delay
+ogamenet.autojoin
+ogamenet.autorejoin
+ogamenet.autorejoin_delay
+ogamenet.connection_timeout
+ogamenet.anti_flood_prio_high
+ogamenet.anti_flood_prio_low
+ogamenet.away_check
+ogamenet.away_check_max_nicks
+ogamenet.default_msg_kick
+ogamenet.default_msg_part
+ogamenet.default_msg_quit
+ogamenet.notify
diff --git a/weechat/logger.conf b/weechat/logger.conf
index ac974b9..c89de19 100644
--- a/weechat/logger.conf
+++ b/weechat/logger.conf
@@ -2,6 +2,9 @@
 # logger.conf -- weechat v1.1-dev
 #
 
+[look]
+backlog = 20
+
 [color]
 backlog_end = darkgray
 backlog_line = green
@@ -10,7 +13,7 @@ backlog_line = green
 auto_log = on
 flush_delay = 120
 info_lines = off
-mask = "$server/$channel/%F"
+mask = "$plugin.$name/%F.weechatlog"
 name_lower_case = on
 nick_prefix = ""
 nick_suffix = ""
@@ -20,7 +23,5 @@ time_format = "%Y-%m-%d %H:%M:%S"
 
 [level]
 
-[look]
-backlog = 20
-
 [mask]
+irc = "$server/$channel/%F"
diff --git a/weechat/plugins.conf b/weechat/plugins.conf
index e5acb7f..70f73c2 100644
--- a/weechat/plugins.conf
+++ b/weechat/plugins.conf
@@ -44,6 +44,7 @@ perl.highmon.away_only = "off"
 perl.highmon.bar_lines = "3"
 perl.highmon.bar_scrolldown = "off"
 perl.highmon.color_buf = "on"
+perl.highmon.first_run = "true"
 perl.highmon.hotlist_show = "off"
 perl.highmon.logging = "off"
 perl.highmon.merge_private = ""
@@ -73,6 +74,34 @@ perl.multiline.paste_lock = "1"
 perl.multiline.send_empty = "on"
 perl.multiline.tab = "──▶▏"
 perl.multiline.weechat_paste_fix = "on"
+perl.nickregain.chat.freenode.net_command = ""
+perl.nickregain.chat.freenode.net_command_delay = "0"
+perl.nickregain.chat.freenode.net_delay = "60"
+perl.nickregain.chat.freenode.net_enabled = "off"
+perl.nickregain.foonetic_command = ""
+perl.nickregain.foonetic_command_delay = "0"
+perl.nickregain.foonetic_delay = "60"
+perl.nickregain.foonetic_enabled = "off"
+perl.nickregain.freenode_command = ""
+perl.nickregain.freenode_command_delay = "0"
+perl.nickregain.freenode_delay = "60"
+perl.nickregain.freenode_enabled = "off"
+perl.nickregain.furnet_command = ""
+perl.nickregain.furnet_command_delay = "0"
+perl.nickregain.furnet_delay = "60"
+perl.nickregain.furnet_enabled = "off"
+perl.nickregain.mozilla_command = ""
+perl.nickregain.mozilla_command_delay = "0"
+perl.nickregain.mozilla_delay = "60"
+perl.nickregain.mozilla_enabled = "off"
+perl.nickregain.ogamenet_command = ""
+perl.nickregain.ogamenet_command_delay = "0"
+perl.nickregain.ogamenet_delay = "60"
+perl.nickregain.ogamenet_enabled = "off"
+perl.nickregain.therian_command = ""
+perl.nickregain.therian_command_delay = "0"
+perl.nickregain.therian_delay = "60"
+perl.nickregain.therian_enabled = "off"
 perl.stalker.additional_join_info = "on"
 perl.stalker.db_name = "%h/nicks.db"
 perl.stalker.debug = "off"
@@ -105,7 +134,7 @@ python.announce_url_title.prefix = ""
 python.announce_url_title.reannounce_wait = "5"
 python.announce_url_title.suffix = ""
 python.announce_url_title.title_max_length = "80"
-python.announce_url_title.url_ignore = ""
+python.announce_url_title.url_ignore = "http://git.io/"
 python.announce_url_title.user_agent = "WeeChat/%(version)s (http://www.weechat.org)"
 python.autosavekey.mute = "off"
 python.autosavekey.secure = "off"
@@ -118,8 +147,37 @@ python.chanop.enable_multi_kick = "off"
 python.chanop.enable_remove = "off"
 python.chanop.kick_reason = ""
 python.chanop.op_command = "/msg chanserv op $channel $nick"
-python.chanop.watchlist.freenode = "#archlinux-multimedia,#archlinux-offtopic,#archlinux-botabuse,#kyriasis,#archlinux"
+python.chanop.watchlist.freenode = "#kyriasis,#archlinux-botabuse,#archlinux,#archlinux-unregistered,#archlinux-offtopic,##demize"
 python.check_license = "on"
+python.clone_scanner.autofocus = "on"
+python.clone_scanner.clone_onjoin_alert_key = "mask"
+python.clone_scanner.clone_report_key = "mask"
+python.clone_scanner.colors.clone_report.clone.match = "chat"
+python.clone_scanner.colors.clone_report.clone.message = "chat"
+python.clone_scanner.colors.clone_report.header.channel = "bold"
+python.clone_scanner.colors.clone_report.header.message = "chat"
+python.clone_scanner.colors.clone_report.header.number_of_hosts = "bold"
+python.clone_scanner.colors.clone_report.subheader.host = "bold"
+python.clone_scanner.colors.clone_report.subheader.message = "chat"
+python.clone_scanner.colors.clone_report.subheader.number_of_clones = "bold"
+python.clone_scanner.colors.join_messages.channel = "bold"
+python.clone_scanner.colors.join_messages.identhost = "chat"
+python.clone_scanner.colors.join_messages.message = "chat"
+python.clone_scanner.colors.join_messages.nick = "bold"
+python.clone_scanner.colors.mask.identhost = ""
+python.clone_scanner.colors.mask.nick = "bold"
+python.clone_scanner.colors.onjoin_alert.channel = "red"
+python.clone_scanner.colors.onjoin_alert.matches = "bold red"
+python.clone_scanner.colors.onjoin_alert.message = "red"
+python.clone_scanner.colors.onjoin_alert.nick = "bold red"
+python.clone_scanner.compare_idents = "off"
+python.clone_scanner.display_join_messages = "off"
+python.clone_scanner.display_onjoin_alert_clone_buffer = "off"
+python.clone_scanner.display_onjoin_alert_current_buffer = "off"
+python.clone_scanner.display_onjoin_alert_target_buffer = "on"
+python.clone_scanner.display_scan_report_clone_buffer = "off"
+python.clone_scanner.display_scan_report_current_buffer = "on"
+python.clone_scanner.display_scan_report_target_buffer = "off"
 python.colorize_nicks.blacklist_channels = ""
 python.colorize_nicks.blacklist_nicks = "so,root"
 python.colorize_nicks.colorize_input = "on"
@@ -135,7 +193,6 @@ python.copy.enable_multi_kick = "off"
 python.copy.enable_remove = "off"
 python.copy.kick_reason = ""
 python.copy.op_command = "/msg chanserv op $channel $nick"
-python.copy.watchlist.freenode = "#kyriasis"
 python.go.auto_jump = "on"
 python.go.color_name = "black,cyan"
 python.go.color_name_highlight = "red,cyan"
@@ -250,6 +307,35 @@ perl.url_arza.url_append_command = "string to append to the url when shortening
 perl.url_arza.url_append_incoming = "string to append to the url when shortening incoming urls (default: &id_min_length=2)"
 python.autosavekey.mute = "execute command silently, only error messages will be displayed. (default: "off")"
 python.autosavekey.secure = "change channel key in secure data. (default: "off")"
+python.clone_scanner.autofocus = "Focus the clone_scanner buffer in the current window if it isn't already displayed by a window."
+python.clone_scanner.clone_onjoin_alert_key = "Which 'key' to display in the on-join alerts: 'mask' for full hostmasks, or 'nick' for nicks"
+python.clone_scanner.clone_report_key = "Which 'key' to display in the clone report: 'mask' for full hostmasks, or 'nick' for nicks"
+python.clone_scanner.colors.clone_report.clone.match = "The colour of the match details (masks or nicks) in the clone report."
+python.clone_scanner.colors.clone_report.clone.message = "The colour of the clone hit in the clone report message."
+python.clone_scanner.colors.clone_report.header.channel = "The colour of the channel name in the clone report header."
+python.clone_scanner.colors.clone_report.header.message = "The colour of the clone report header."
+python.clone_scanner.colors.clone_report.header.number_of_hosts = "The colour of the number of hosts in the clone report header."
+python.clone_scanner.colors.clone_report.subheader.host = "The colour of the host in the clone report subheader."
+python.clone_scanner.colors.clone_report.subheader.message = "The colour of the clone report subheader."
+python.clone_scanner.colors.clone_report.subheader.number_of_clones = "The colour of the number of clones in the clone report subheader."
+python.clone_scanner.colors.join_messages.channel = "The colour for the 'channel'-part of the join messages."
+python.clone_scanner.colors.join_messages.identhost = "The colour for the 'ident@host'-part of the join messages."
+python.clone_scanner.colors.join_messages.message = "The base colour for the join messages."
+python.clone_scanner.colors.join_messages.nick = "The colour for the 'nick'-part of the join messages. Note: if you have colorize_nicks, this option might not always work as expected."
+python.clone_scanner.colors.mask.identhost = "The formatting of the identhost in the match mask."
+python.clone_scanner.colors.mask.nick = "The formatting of the nick in the match mask."
+python.clone_scanner.colors.onjoin_alert.channel = "The on-join clone alert's channel colour. Formats are space separated."
+python.clone_scanner.colors.onjoin_alert.matches = "The on-join clone alert's matches (masks or nicks) colour. Formats are space separated. Note: if you have colorize_nicks, this option might not work as expected."
+python.clone_scanner.colors.onjoin_alert.message = "The on-join clone alert's message colour. Formats are space separated."
+python.clone_scanner.colors.onjoin_alert.nick = "The on-join clone alert's nick colour. Formats are space separated. Note: if you have colorize_nicks, this option might not work as expected."
+python.clone_scanner.compare_idents = "Match against ident@host.name instead of just the hostname. Useful if you don't want different people from bouncers marked as clones"
+python.clone_scanner.display_join_messages = "Display all joins in the clone_scanner buffer"
+python.clone_scanner.display_onjoin_alert_clone_buffer = "Display an on-join clone alert in the clone_scanner buffer"
+python.clone_scanner.display_onjoin_alert_current_buffer = "Display an on-join clone alert in the current buffer"
+python.clone_scanner.display_onjoin_alert_target_buffer = "Display an on-join clone alert in the buffer where the clone was detected"
+python.clone_scanner.display_scan_report_clone_buffer = "Display manual scan reports in the clone buffer"
+python.clone_scanner.display_scan_report_current_buffer = "Display manual scan reports in the current buffer"
+python.clone_scanner.display_scan_report_target_buffer = "Display manual scan reports in the buffer of the scanned channel"
 python.go.auto_jump = "automatically jump to buffer when it is uniquely selected (default: "off")"
 python.go.color_name = "color for buffer name (not selected) (default: "black,cyan")"
 python.go.color_name_highlight = "color for highlight in buffer name (not selected) (default: "red,cyan")"
diff --git a/weechat/relay.conf b/weechat/relay.conf
index fa2ee4c..ffc9282 100644
--- a/weechat/relay.conf
+++ b/weechat/relay.conf
@@ -2,6 +2,10 @@
 # relay.conf -- weechat v1.1-dev
 #
 
+[look]
+auto_open_buffer = on
+raw_messages = 256
+
 [color]
 client = cyan
 status_active = lightblue
@@ -13,17 +17,6 @@ text = default
 text_bg = default
 text_selected = white
 
-[irc]
-backlog_max_minutes = 1440
-backlog_max_number = 256
-backlog_since_last_disconnect = on
-backlog_tags = "irc_privmsg"
-backlog_time_format = "[%H:%M] "
-
-[look]
-auto_open_buffer = on
-raw_messages = 256
-
 [network]
 allowed_ips = ""
 bind_address = ""
@@ -33,6 +26,14 @@ ipv6 = on
 max_clients = 5
 password = ""
 ssl_cert_key = "%h/ssl/relay.pem"
+ssl_priorities = "PERFORMANCE"
 websocket_allowed_origins = ""
 
+[irc]
+backlog_max_minutes = 1440
+backlog_max_number = 256
+backlog_since_last_disconnect = on
+backlog_tags = "irc_privmsg"
+backlog_time_format = "[%H:%M] "
+
 [port]
diff --git a/weechat/script.conf b/weechat/script.conf
index 9973071..475e643 100644
--- a/weechat/script.conf
+++ b/weechat/script.conf
@@ -2,6 +2,16 @@
 # script.conf -- weechat v1.1-dev
 #
 
+[look]
+columns = "%s %n %V %v %u | %d | %t"
+diff_color = on
+diff_command = "auto"
+display_source = on
+quiet_actions = on
+sort = "u,n"
+translate_description = on
+use_keys = on
+
 [color]
 status_autoloaded = cyan
 status_held = white
@@ -30,19 +40,10 @@ text_version_loaded = default
 text_version_loaded_selected = white
 text_version_selected = lightmagenta
 
-[look]
-columns = "%s %n %V %v %u | %d | %t"
-diff_color = on
-diff_command = "auto"
-display_source = on
-quiet_actions = on
-sort = "u,n"
-translate_description = on
-use_keys = on
-
 [scripts]
 autoload = on
 cache_expire = 60
 dir = "%h/script"
 hold = ""
 url = "http://www.weechat.org/files/plugins.xml.gz"
+url_force_https = on
diff --git a/weechat/trigger.conf b/weechat/trigger.conf
index 8f75db7..a53f470 100644
--- a/weechat/trigger.conf
+++ b/weechat/trigger.conf
@@ -2,6 +2,10 @@
 # trigger.conf -- weechat v1.1-dev
 #
 
+[look]
+enabled = on
+monitor_strip_colors = off
+
 [color]
 flag_command = lightgreen
 flag_conditions = yellow
@@ -12,10 +16,6 @@ replace = cyan
 trigger = green
 trigger_disabled = red
 
-[look]
-enabled = on
-monitor_strip_colors = off
-
 [trigger]
 beep.arguments = ""
 beep.command = "/print -beep"
diff --git a/weechat/xfer.conf b/weechat/xfer.conf
index 2bfc881..583f62a 100644
--- a/weechat/xfer.conf
+++ b/weechat/xfer.conf
@@ -2,6 +2,11 @@
 # xfer.conf -- weechat v1.1-dev
 #
 
+[look]
+auto_open_buffer = on
+progress_bar_size = 20
+pv_tags = "notify_private"
+
 [color]
 status_aborted = lightred
 status_active = lightblue
@@ -13,6 +18,14 @@ text = default
 text_bg = default
 text_selected = white
 
+[network]
+blocksize = 65536
+fast_send = on
+own_ip = ""
+port_range = ""
+speed_limit = 0
+timeout = 300
+
 [file]
 auto_accept_chats = off
 auto_accept_files = off
@@ -24,16 +37,3 @@ convert_spaces = on
 download_path = "%h/xfer"
 upload_path = "~"
 use_nick_in_filename = on
-
-[look]
-auto_open_buffer = on
-progress_bar_size = 20
-pv_tags = "notify_private"
-
-[network]
-blocksize = 65536
-fast_send = on
-own_ip = ""
-port_range = ""
-speed_limit = 0
-timeout = 300