# HG changeset patch # User Steve Losh # Date 1435595256 14400 # Node ID be4d78a6570267bb5f6d4f0e11ee19c19767ada4 # Parent 70a37fa073ed0039867557d265fe19abd86a7a32# Parent e3f758e825299d9f92d4c13946002a38379579ab Merge. diff -r e3f758e82529 -r be4d78a65702 .hgsubstate --- a/.hgsubstate Wed May 20 22:05:20 2015 -0400 +++ b/.hgsubstate Mon Jun 29 12:27:36 2015 -0400 @@ -13,7 +13,7 @@ 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch 3a843cb1b183bd853b843fbaef89af27b726ac25 vim/bundle/fireplace -34e2d2538a634a0a820a56994333ffa1fec1bc58 vim/bundle/fugitive +935a2cccd3065b1322fb2235285d42728600afdf vim/bundle/fugitive 6e9f52a160e3d15060848a8f453bd1b5bfa70db2 vim/bundle/gnupg eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo 34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5 diff -r e3f758e82529 -r be4d78a65702 sjl.keylayout --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sjl.keylayout Mon Jun 29 12:27:36 2015 -0400 @@ -0,0 +1,1146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r e3f758e82529 -r be4d78a65702 weechat/autosort.conf --- a/weechat/autosort.conf Wed May 20 22:05:20 2015 -0400 +++ b/weechat/autosort.conf Mon Jun 29 12:27:36 2015 -0400 @@ -1,11 +1,11 @@ # -# autosort.conf -- weechat v1.1.1 +# weechat -- autosort.conf # [sorting] case_sensitive = off group_irc = on -replacements = "[]" +replacements = "[["##", "#zzzzz"]]" rules = "[["core", 0], ["irc", 2], ["*", 1], ["irc.irc_raw", 0], ["irc.server", 1]]" signals = "buffer_opened buffer_merged buffer_unmerged buffer_renamed" sort_on_config_change = on diff -r e3f758e82529 -r be4d78a65702 weechat/buffers.conf diff -r e3f758e82529 -r be4d78a65702 weechat/exec.conf --- a/weechat/exec.conf Wed May 20 22:05:20 2015 -0400 +++ b/weechat/exec.conf Mon Jun 29 12:27:36 2015 -0400 @@ -1,5 +1,5 @@ # -# exec.conf -- weechat v1.1.1 +# weechat -- exec.conf # [command] diff -r e3f758e82529 -r be4d78a65702 weechat/plugins.conf --- a/weechat/plugins.conf Wed May 20 22:05:20 2015 -0400 +++ b/weechat/plugins.conf Mon Jun 29 12:27:36 2015 -0400 @@ -42,6 +42,7 @@ perl.colorize_lines.nicks = "" perl.colorize_lines.own_lines = "off" perl.colorize_lines.shuffle = "off" +perl.listsort.max_size = "10000" python.check_license = "on" python.growl.hostname = "" python.growl.icon = "icon.png" @@ -59,6 +60,12 @@ python.growl.show_upgrade_ended = "on" python.growl.sticky = "off" python.growl.sticky_away = "on" +python.listbuffer.autofocus = "on" +python.listbuffer.channel_min_width = "25" +python.listbuffer.modes_min_width = "8" +python.listbuffer.sort_inverted = "off" +python.listbuffer.sort_order = "channel" +python.listbuffer.users_min_width = "8" python.notification_center.show_highlights = "on" python.notification_center.show_message_text = "on" python.notification_center.show_private_message = "on" @@ -80,3 +87,10 @@ perl.colorize_lines.nicks = "comma separated list with nicknames. Only messages from nicks in this list will be colorized. (e.g.: freenode.nils_2,freenode.flashcode,freenode.weebot). You can also give a filename with nicks. The filename has to start with "/" (e.g.: /buddylist.txt). The format has to be: one nick each line with ." perl.colorize_lines.own_lines = "colors own written messages (default: off)" perl.colorize_lines.shuffle = "toggle shuffle color mode for chats area (default: off)" +perl.listsort.max_size = "maximum size of /list output in kilobytes to be handled" +python.listbuffer.autofocus = "Focus the listbuffer in the current window if it isn't already displayed by a window." +python.listbuffer.channel_min_width = "The minimum width used for the channel name in the channel list. If a channelname is shorter than this amount, the column will be padded with spaces." +python.listbuffer.modes_min_width = "The minimum width used for modes in the channel list. If a channel has less modes than this amount, the column will be padded with spaces." +python.listbuffer.sort_inverted = "Invert the sort order for the channel list." +python.listbuffer.sort_order = "Last used sort order for the channel list." +python.listbuffer.users_min_width = "The minimum width used for the usercount in the channel list. If the usercount has less digits than this amount, the column will be padded with spaces." diff -r e3f758e82529 -r be4d78a65702 weechat/trigger.conf --- a/weechat/trigger.conf Wed May 20 22:05:20 2015 -0400 +++ b/weechat/trigger.conf Mon Jun 29 12:27:36 2015 -0400 @@ -1,5 +1,5 @@ # -# trigger.conf -- weechat v1.1.1 +# weechat -- trigger.conf # [look] @@ -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.conditions = "${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.command = "" -cmd_pass.conditions = "" +beep.return_code = "ok" 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 +[^ ]+) +)(.*)==$1$.*+" -cmd_pass.return_code = ok -msg_auth.arguments = "5000|irc_message_auth" -msg_auth.command = "" -msg_auth.conditions = "" +cmd_pass.hook = "modifier" +cmd_pass.arguments = "5000|input_text_display;5000|history_add;5000|irc_command_auth" +cmd_pass.conditions = "" +cmd_pass.regex = "==^((/(msg|m|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 -msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==$1$.*+" -msg_auth.return_code = ok +msg_auth.hook = "modifier" +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" server_pass.arguments = "5000|input_text_display;5000|history_add" +server_pass.conditions = "" +server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==${re:1}${hide:*,${re:4}}${re:5}" server_pass.command = "" -server_pass.conditions = "" -server_pass.enabled = on -server_pass.hook = modifier -server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==$1$.*4$5" -server_pass.return_code = ok +server_pass.return_code = "(null)" diff -r e3f758e82529 -r be4d78a65702 weechat/weechat.conf --- a/weechat/weechat.conf Wed May 20 22:05:20 2015 -0400 +++ b/weechat/weechat.conf Mon Jun 29 12:27:36 2015 -0400 @@ -295,7 +295,7 @@ ctrl-F = "/input move_next_char" ctrl-H = "/input delete_previous_char" ctrl-I = "/input complete_next" -ctrl-J = "/buffer move +1" +ctrl-J = "/input jump_smart" ctrl-K = "/input delete_end_of_line" ctrl-L = "/window refresh" ctrl-M = "/input return"