diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2014-01-09 17:21:19 +0100 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2014-01-09 17:21:19 +0100 |
commit | 73eb2564f363848d379261fd68da9fc16b80e00f (patch) | |
tree | 9bd2e98a00ce52c081b308a242ec92cd0b151fbd /src | |
parent | 7e540dc5fb7dfb31f1b9c39002c63e62fdf429af (diff) | |
download | weechat-73eb2564f363848d379261fd68da9fc16b80e00f.zip |
core: add "POSIX extended" in description of options/commands/functions using regular expressions
Diffstat (limited to 'src')
-rw-r--r-- | src/core/wee-command.c | 11 | ||||
-rw-r--r-- | src/core/wee-config.c | 15 | ||||
-rw-r--r-- | src/plugins/irc/irc-command.c | 13 | ||||
-rw-r--r-- | src/plugins/relay/relay-config.c | 16 | ||||
-rw-r--r-- | src/plugins/rmodifier/rmodifier-command.c | 5 |
5 files changed, 33 insertions, 27 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 1f64ba6cd..97453b877 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -6515,8 +6515,8 @@ command_init () " < less\n" " >= greater or equal\n" " > greater\n" - " =~ is matching regex\n" - " !~ is NOT matching regex\n\n" + " =~ is matching POSIX extended regex\n" + " !~ is NOT matching POSIX extended regex\n\n" "An expression is considered as \"true\" if it is not NULL, " "not empty, and different from \"0\".\n" "The comparison is made using integers if the two " @@ -6594,9 +6594,10 @@ command_init () " - logical \"and\": use \"+\" between tags (for " "example: \"nick_toto+irc_action\")\n" " - tags can start or end with '*'\n" - " regex: regular expression to search in line\n" - " - use '\\t' to separate prefix from message, special " - "chars like '|' must be escaped: '\\|'\n" + " regex: POSIX extended regular expression to search in " + "line\n" + " - use '\\t' to separate prefix from message, " + "special chars like '|' must be escaped: '\\|'\n" " - if regex starts with '!', then matching " "result is reversed (use '\\!' to start with '!')\n" " - two regular expressions are created: one for " diff --git a/src/core/wee-config.c b/src/core/wee-config.c index b91e89d03..34ded8019 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -2071,8 +2071,8 @@ config_weechat_init_options () config_look_buffer_search_regex = config_file_new_option ( weechat_config_file, ptr_section, "buffer_search_regex", "boolean", - N_("default text search in buffer: if enabled, search regular expression, " - "otherwise search simple string"), + N_("default text search in buffer: if enabled, search POSIX extended " + "regular expression, otherwise search simple string"), NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); config_look_buffer_search_where = config_file_new_option ( weechat_config_file, ptr_section, @@ -2224,11 +2224,12 @@ config_weechat_init_options () config_look_highlight_regex = config_file_new_option ( weechat_config_file, ptr_section, "highlight_regex", "string", - N_("regular expression used to check if a message has highlight or not, " - "at least one match in string must be surrounded by word chars " - "(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case " - "insensitive (use \"(?-i)\" at beginning to make it case sensitive), " - "examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""), + N_("POSIX extended regular expression used to check if a message has " + "highlight or not, at least one match in string must be surrounded " + "by word chars (alphanumeric, \"-\", \"_\" or \"|\"), regular " + "expression is case insensitive (use \"(?-i)\" at beginning to make " + "it case sensitive), examples: \"flashcode|flashy\", " + "\"(?-i)FlashCode|flashy\""), NULL, 0, 0, "", NULL, 0, NULL, NULL, &config_change_highlight_regex, NULL, NULL, NULL); config_look_highlight_tags = config_file_new_option ( weechat_config_file, ptr_section, diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 82b5cd4fa..92601bb05 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -5977,9 +5977,10 @@ irc_command_init () " || del <number>|-all"), N_(" list: list all ignores\n" " add: add an ignore\n" - " nick: nick or hostname (can be regular " - "expression if \"re:\" is given or a mask using " - "\"*\" to replace one or more chars)\n" + " nick: nick or hostname (can be a POSIX " + "extended regular expression if \"re:\" is given " + "or a mask using \"*\" to replace one or more " + "chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at " "list to find it)\n" @@ -6079,9 +6080,9 @@ irc_command_init () "[-re <regex>]"), N_("channel: channel to list\n" " server: server name\n" - " regex: regular expression used to filter " - "results (case insensitive, can start by \"(?-i)\" " - "to become case sensitive)\n\n" + " regex: POSIX extended regular expression used " + "to filter results (case insensitive, can start " + "by \"(?-i)\" to become case sensitive)\n\n" "Examples:\n" " list all channels on server (can be very slow " "on large networks):\n" diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c index 7b60bc40e..e0e46cbe1 100644 --- a/src/plugins/relay/relay-config.c +++ b/src/plugins/relay/relay-config.c @@ -588,10 +588,11 @@ relay_config_init () relay_config_network_allowed_ips = weechat_config_new_option ( relay_config_file, ptr_section, "allowed_ips", "string", - N_("regular expression with IPs allowed to use relay (case insensitive, " - "use \"(?-i)\" at beginning to make it case sensitive); if IPv6 is " - "enabled and that connection is made using IPv4, it will be " - "IPv4-mapped IPv6 address (like: \"::ffff:127.0.0.1\"), example: " + N_("POSIX extended regular expression with IPs allowed to use relay " + "(case insensitive, use \"(?-i)\" at beginning to make it case " + "sensitive); if IPv6 is enabled and that connection is made using " + "IPv4, it will be IPv4-mapped IPv6 address (like: " + "\"::ffff:127.0.0.1\"), example: " "\"^((::ffff:)?123.45.67.89|192.160.*)$\""), NULL, 0, 0, "", NULL, 0, NULL, NULL, &relay_config_change_network_allowed_ips, NULL, NULL, NULL); @@ -642,9 +643,10 @@ relay_config_init () relay_config_network_websocket_allowed_origins = weechat_config_new_option ( relay_config_file, ptr_section, "websocket_allowed_origins", "string", - N_("regular expression with origins allowed in websockets (case " - "insensitive, use \"(?-i)\" at beginning to make it case sensitive), " - "example: \"^http://(www\\.)?example\\.(com|org)\""), + N_("POSIX extended regular expression with origins allowed in " + "websockets (case insensitive, use \"(?-i)\" at beginning to make " + "it case sensitive), example: " + "\"^http://(www\\.)?example\\.(com|org)\""), NULL, 0, 0, "", NULL, 0, NULL, NULL, &relay_config_change_network_websocket_allowed_origins, NULL, NULL, NULL); diff --git a/src/plugins/rmodifier/rmodifier-command.c b/src/plugins/rmodifier/rmodifier-command.c index 421d7170f..bb3eeccf4 100644 --- a/src/plugins/rmodifier/rmodifier-command.c +++ b/src/plugins/rmodifier/rmodifier-command.c @@ -256,8 +256,9 @@ rmodifier_command_init () "expression (inside parentheses): comma separated " "list of groups (from 1 to 9) with optional \"*\" " "after number to hide the group\n" - " regex: regular expression (case insensitive, " - "can start by \"(?-i)\" to become case sensitive)\n" + " regex: POSIX extended regular expression " + "(case insensitive, can start by \"(?-i)\" to " + "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" " missing: add missing rmodifiers\n" |