From b64de434670af2b75ad1b15c0fe9d06d088dd032 Mon Sep 17 00:00:00 2001 From: Jody Leonard Date: Sat, 24 Oct 2015 05:52:47 -0400 Subject: [PATCH 1/2] Change tab coloring behavior for several rc's The commit mariuszs/nanorc@e5cc8be8639a9f535fb5f41d2dfa8d647bedb659 introduced a number of rc files that cause tabs to always show as red (even with trailing spaces). Adjust the behavior according to changes in https://github.com/nanorc/nanorc/blob/master/mixins/lint.nanorc, which seems to be an updated source of the original commit. Make tabs appear green without trailing characters, red with trailing spaces, and uncolored when followed by any other character. --- awk.nanorc | 2 +- coffeescript.nanorc | 2 +- csharp.nanorc | 2 +- glsl.nanorc | 2 +- go.nanorc | 2 +- ini.nanorc | 2 +- inputrc.nanorc | 2 +- javascript.nanorc | 2 +- json.nanorc | 2 +- keymap.nanorc | 2 +- kickstart.nanorc | 2 +- lisp.nanorc | 2 +- mpdconf.nanorc | 2 +- nginx.nanorc | 2 +- peg.nanorc | 2 +- pkg-config.nanorc | 2 +- po.nanorc | 2 +- privoxy.nanorc | 6 +++--- rpmspec.nanorc | 2 +- sed.nanorc | 2 +- sql.nanorc | 2 +- systemd.nanorc | 2 +- vala.nanorc | 2 +- vi.nanorc | 2 +- xresources.nanorc | 2 +- yaml.nanorc | 2 +- yum.nanorc | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) diff --git a/awk.nanorc b/awk.nanorc index 02ed08b..e037b65 100644 --- a/awk.nanorc +++ b/awk.nanorc @@ -22,4 +22,4 @@ color magenta "\\." color brightblack "(^|[[:space:]])#([^{].*)?$" color brightwhite,cyan "TODO:?" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/coffeescript.nanorc b/coffeescript.nanorc index 4e1650c..110b65a 100644 --- a/coffeescript.nanorc +++ b/coffeescript.nanorc @@ -13,4 +13,4 @@ color brightyellow "@[A-Za-z0-9_]*" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/csharp.nanorc b/csharp.nanorc index 6390b38..3c8a25b 100644 --- a/csharp.nanorc +++ b/csharp.nanorc @@ -24,4 +24,4 @@ color brightblack "(^|[[:space:]])//.*" color brightblack start="/\*" end="\*/" color brightwhite,cyan "TODO:?" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/glsl.nanorc b/glsl.nanorc index bdd1b08..546765d 100644 --- a/glsl.nanorc +++ b/glsl.nanorc @@ -13,4 +13,4 @@ color brightblack "(^|[[:space:]])//.*" color brightblack start="/\*" end="\*/" color brightwhite,cyan "TODO:?" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/go.nanorc b/go.nanorc index 67351ea..5bf3182 100644 --- a/go.nanorc +++ b/go.nanorc @@ -20,4 +20,4 @@ color brightblack "(^|[[:space:]])//.*" color brightblack start="/\*" end="\*/" color brightwhite,cyan "TODO:?" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/ini.nanorc b/ini.nanorc index bc4387b..26daea3 100644 --- a/ini.nanorc +++ b/ini.nanorc @@ -8,4 +8,4 @@ color red "[=;]" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/inputrc.nanorc b/inputrc.nanorc index 16b9f30..c0b8f6e 100644 --- a/inputrc.nanorc +++ b/inputrc.nanorc @@ -7,4 +7,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color magenta "\\.?" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/javascript.nanorc b/javascript.nanorc index fa2d6c5..898b7a2 100644 --- a/javascript.nanorc +++ b/javascript.nanorc @@ -20,4 +20,4 @@ color brightblack "/\*.+\*/" color brightwhite,cyan "TODO:?" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/json.nanorc b/json.nanorc index 1740a4c..d6338c9 100644 --- a/json.nanorc +++ b/json.nanorc @@ -8,4 +8,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightyellow "\"(\\"|[^"])*\"[[:space:]]*:" "'(\'|[^'])*'[[:space:]]*:" color magenta "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/keymap.nanorc b/keymap.nanorc index bc2bdb9..bd89707 100644 --- a/keymap.nanorc +++ b/keymap.nanorc @@ -7,4 +7,4 @@ color red "=" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightblack "^!.*$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/kickstart.nanorc b/kickstart.nanorc index 85e2213..255618f 100644 --- a/kickstart.nanorc +++ b/kickstart.nanorc @@ -12,4 +12,4 @@ color red "^-[a-zA-Z0-9*-]+" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/lisp.nanorc b/lisp.nanorc index 8094c7f..b4b0791 100644 --- a/lisp.nanorc +++ b/lisp.nanorc @@ -11,4 +11,4 @@ color magenta "'[A-Za-z][A-Za-z0-9_-]+" color magenta "\\.?" color brightblack "(^|[[:space:]]);.*" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/mpdconf.nanorc b/mpdconf.nanorc index ea57468..347e6f4 100644 --- a/mpdconf.nanorc +++ b/mpdconf.nanorc @@ -6,4 +6,4 @@ color brightmagenta "^(input|audio_output|decoder)[[:space:]]*\{|\}" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/nginx.nanorc b/nginx.nanorc index a671237..d3b6bca 100644 --- a/nginx.nanorc +++ b/nginx.nanorc @@ -11,4 +11,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color yellow start="'$" end="';$" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/peg.nanorc b/peg.nanorc index 975c628..858d5f8 100644 --- a/peg.nanorc +++ b/peg.nanorc @@ -9,4 +9,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightblack "(^|[[:space:]])\-\-.*$" color brightwhite,cyan "TODO:?" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/pkg-config.nanorc b/pkg-config.nanorc index 1d05b03..6dff0f6 100644 --- a/pkg-config.nanorc +++ b/pkg-config.nanorc @@ -5,4 +5,4 @@ color cyan "^(Requires|Libs)(\.private)?:" color red "=" color brightyellow "\$\{[A-Za-z_][A-Za-z0-9_]*\}" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/po.nanorc b/po.nanorc index 79d521f..f35e49f 100644 --- a/po.nanorc +++ b/po.nanorc @@ -5,4 +5,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color magenta "\\.?" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/privoxy.nanorc b/privoxy.nanorc index cd8d992..8f4be96 100644 --- a/privoxy.nanorc +++ b/privoxy.nanorc @@ -3,7 +3,7 @@ syntax "privoxy-config" "privoxy/config$" color cyan "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" syntax "privoxy-action" "\.action$" @@ -16,7 +16,7 @@ color black "[{}]" color magenta "\\.?" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" syntax "privoxy-filter" "\.filter$" @@ -25,5 +25,5 @@ color brightblue "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEAD color magenta "\\.?" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/rpmspec.nanorc b/rpmspec.nanorc index 4370c1c..e05ad6a 100644 --- a/rpmspec.nanorc +++ b/rpmspec.nanorc @@ -23,5 +23,5 @@ color brightmagenta "^%(trigger|triggerin|triggerpostun|triggerun|verifyscript) color brightblack "(^|[[:space:]])#([^{].*)?$" color blue "^\*.*$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" color brightwhite,cyan "TODO:?" diff --git a/sed.nanorc b/sed.nanorc index 37692df..84cbafc 100644 --- a/sed.nanorc +++ b/sed.nanorc @@ -6,4 +6,4 @@ color brightyellow "\{[0-9]+,?[0-9]*\}" color magenta "\\." color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/sql.nanorc b/sql.nanorc index 89417c5..650214a 100644 --- a/sql.nanorc +++ b/sql.nanorc @@ -31,4 +31,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color yellow "`(\\.|[^\\`])*`" color brightblack "\-\-.*$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/systemd.nanorc b/systemd.nanorc index 9a7a658..1a3ea91 100644 --- a/systemd.nanorc +++ b/systemd.nanorc @@ -9,4 +9,4 @@ color brightyellow "\$MAINPID" color brightcyan "\<(true|false)\>" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/vala.nanorc b/vala.nanorc index bedac18..512356b 100644 --- a/vala.nanorc +++ b/vala.nanorc @@ -16,4 +16,4 @@ color brightblack "(^|[[:space:]])//.*" color brightblack start="/\*" end="\*/" color brightwhite,cyan "TODO:?" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/vi.nanorc b/vi.nanorc index 6098b82..8c5a001 100644 --- a/vi.nanorc +++ b/vi.nanorc @@ -8,4 +8,4 @@ color red "[!&=]" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightblack "(^|[[:space:]])\"[^"]*$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/xresources.nanorc b/xresources.nanorc index 3a6287f..a49cb3f 100644 --- a/xresources.nanorc +++ b/xresources.nanorc @@ -7,4 +7,4 @@ color red "[*:=]" color brightcyan "\<(true|false)\>" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/yaml.nanorc b/yaml.nanorc index 9956ac7..c2b926b 100644 --- a/yaml.nanorc +++ b/yaml.nanorc @@ -10,4 +10,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color brightblack "(^|[[:space:]])#([^{].*)?$" color brightmagenta "^---" "^\.\.\." "^%YAML" "^%TAG" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" diff --git a/yum.nanorc b/yum.nanorc index 58c1a0b..6ca9f05 100644 --- a/yum.nanorc +++ b/yum.nanorc @@ -5,4 +5,4 @@ color brightmagenta "^[[:space:]]*\[.*\]$" color brightyellow "\$(releasever|arch|basearch|uuid|YUM[0-9])" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" -color ,red " +" +color ,red " + +| + +" From b1c896c01c644c627c5e6c923ce3a394fd9ccd97 Mon Sep 17 00:00:00 2001 From: Jody Leonard Date: Sat, 24 Oct 2015 07:55:49 -0400 Subject: [PATCH 2/2] Remove black coloring for several rc's Some of the configurations turn parentheses and or curly braces black, which become invisible against the default nano black background color. --- coffeescript.nanorc | 2 +- csharp.nanorc | 3 +-- glsl.nanorc | 3 +-- go.nanorc | 3 +-- javascript.nanorc | 1 - lisp.nanorc | 1 - nginx.nanorc | 1 - privoxy.nanorc | 1 - vala.nanorc | 3 +-- vi.nanorc | 3 +-- 10 files changed, 6 insertions(+), 15 deletions(-) diff --git a/coffeescript.nanorc b/coffeescript.nanorc index 110b65a..cf75b6c 100644 --- a/coffeescript.nanorc +++ b/coffeescript.nanorc @@ -3,7 +3,7 @@ header "^#!.*/(env +)?coffee" color red "[!&|=/*+-<>]|\<(and|or|is|isnt|not)\>" color brightblue "[A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\()" "->" -color black "[()]" +color brightblue "[()]" color cyan "\<(for|of|continue|break|isnt|null|unless|this|else|if|return)\>" color cyan "\<(try|catch|finally|throw|new|delete|typeof|in|instanceof)\>" color cyan "\<(debugger|switch|while|do|class|extends|super)\>" diff --git a/csharp.nanorc b/csharp.nanorc index 3c8a25b..8c25d1d 100644 --- a/csharp.nanorc +++ b/csharp.nanorc @@ -6,8 +6,7 @@ color brightmagenta "class +[A-Za-z0-9]+ *((:) +[A-Za-z0-9.]+)?" # Annotation color magenta "@[A-Za-z]+" -color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]" -color black "[(]" +color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]" color green "\<(bool|byte|sbyte|char|decimal|double|float|IntPtr|int|uint|long|ulong|object|short|ushort|string|base|this|var|void)\>" color cyan "\<(alias|as|case|catch|checked|default|do|dynamic|else|finally|fixed|for|foreach|goto|if|is|lock|new|null|return|switch|throw|try|unchecked|while)\>" color cyan "\<(abstract|async|class|const|delegate|enum|event|explicit|extern|get|implicit|in|internal|interface|namespace|operator|out|override|params|partial|private|protected|public|readonly|ref|sealed|set|sizeof|stackalloc|static|struct|typeof|unsafe|using|value|virtual|volatile|yield)\>" diff --git a/glsl.nanorc b/glsl.nanorc index 546765d..6da2639 100644 --- a/glsl.nanorc +++ b/glsl.nanorc @@ -1,7 +1,6 @@ syntax "glsl" "\.(frag|vert|fp|vp|glsl)$" -color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]" -color black "[(]" +color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]" color green "\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\>" color green "\" color cyan "\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\>" diff --git a/go.nanorc b/go.nanorc index 5bf3182..92803cd 100644 --- a/go.nanorc +++ b/go.nanorc @@ -1,7 +1,6 @@ syntax "go" "\.go$" -color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]" -color black "[(]" +color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]" color brightblue "\<(append|cap|close|complex|copy|delete|imag|len)\>" color brightblue "\<(make|new|panic|print|println|protect|real|recover)\>" color green "\<(u?int(8|16|32|64)?|float(32|64)|complex(64|128))\>" diff --git a/javascript.nanorc b/javascript.nanorc index 898b7a2..4b6a46e 100644 --- a/javascript.nanorc +++ b/javascript.nanorc @@ -4,7 +4,6 @@ color blue "\<[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\ color blue "\<[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?" color blue "\<[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?" color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]" -color black "[(]" color cyan "\<(break|case|catch|continue|default|delete|do|else|finally)\>" color cyan "\<(for|function|get|if|in|instanceof|new|return|set|switch)\>" color cyan "\<(switch|this|throw|try|typeof|var|void|while|with)\>" diff --git a/lisp.nanorc b/lisp.nanorc index b4b0791..f892a70 100644 --- a/lisp.nanorc +++ b/lisp.nanorc @@ -2,7 +2,6 @@ syntax "lisp" "(emacs|zile)$" "\.(el|li?sp|scm|ss)$" color brightblue "\([a-z-]+" color red "\(([-+*/<>]|<=|>=)|'" -color black "\(" color blue "\<[0-9]+\>" icolor cyan "\" color brightcyan "\<[tT]\>" diff --git a/nginx.nanorc b/nginx.nanorc index d3b6bca..66148b3 100644 --- a/nginx.nanorc +++ b/nginx.nanorc @@ -3,7 +3,6 @@ header "^(server|upstream)[a-z ]*\{$" color brightmagenta "\<(events|server|http|location|upstream)[[:space:]]*\{" color cyan "(^|[[:space:]{;])(access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth_basic|auth_basic_user_file|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|default_type|deny|directio|directio_alignment|disable_symlinks|empty_gif|env|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|log_format|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|port_in_redirect|postpone_output|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_redirect|proxy_send_timeout|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|working_directory|xml_entities|xslt_stylesheet|xslt_types)([[:space:]]|$)" -color black "[{}]" color brightcyan "\<(on|off)\>" color brightyellow "\$[A-Za-z][A-Za-z0-9_]*" color red "[*]" diff --git a/privoxy.nanorc b/privoxy.nanorc index 8f4be96..473df51 100644 --- a/privoxy.nanorc +++ b/privoxy.nanorc @@ -12,7 +12,6 @@ color brightgreen "[{[:space:]]\+block([[:space:]{}]|$)" color brightred "-(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)" color brightgreen "\+(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)" -color black "[{}]" color magenta "\\.?" color brightblack "(^|[[:space:]])#([^{].*)?$" color ,green "[[:space:]]+$" diff --git a/vala.nanorc b/vala.nanorc index 512356b..34509bd 100644 --- a/vala.nanorc +++ b/vala.nanorc @@ -1,8 +1,7 @@ syntax "vala" "\.vala$" color green "\<(float|double|bool|char|int|uint|short|long|void|(un)?signed)\>" -color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]" -color black "[(]" +color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]" color cyan "\<(for|if|while|do|else|case|default|switch|try|throw|catch)\>" color cyan "\<(inline|typedef|struct|enum|union|extern|static|const)\>" color cyan "\<(operator|new|delete|return|null)\>" diff --git a/vi.nanorc b/vi.nanorc index 8c5a001..719dd16 100644 --- a/vi.nanorc +++ b/vi.nanorc @@ -1,7 +1,6 @@ syntax "vi" "(^|/|\.)(ex|vim)rc$|\.vim" -color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]" -color black "[(]" +color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]" color cyan "\<([nvxsoilc]?(nore|un)?map|[nvlx]n|[ico]?no|[cilovx][um]|s?unm)\>" color cyan "\<(snor|nun|nm|set|if|endif|let|unlet)\>" color red "[!&=]"