From ff915b0c107ccd09ce02b2aa8a9f0b471735e9c4 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sat, 11 Nov 2006 02:19:29 +0000 Subject: [PATCH] syntax files git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@751 7f574dfc-610e-0410-a909-a81674777703 --- NEWS | 8 ++++---- extras/nano/conky.nanorc | 2 +- extras/vim/syntax/conkyrc.vim | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index d9e99ce..98631ec 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,9 @@ Summary of changes for Conky release 1.4.3: - xmms_status - xmms_title +* Removed configuration item: + - on_bottom: please use 'own_window_hints below' instead. + * Added support for Audacious music player: http://audacious-media-player.org - Added the following related variables: - audacious_bar @@ -35,9 +38,6 @@ Summary of changes for Conky release 1.4.3: - audacious_status - audacious_title -* Removed configuration item: - - on_bottom: please use 'own_window_hints below' instead. - * Added new configuration item: - max_user_text [default: 16384]: specifies the maximum buffer size for user text in the .conkyrc file. Useful for people with enormous config files who were running @@ -54,5 +54,5 @@ Summary of changes for Conky release 1.4.3: - added WiFi signal level detection on FreeBSD - added Xdamage support for X11 - added verbose configuration information to conky -v - - added extras/ directory to tarball with nano and vim syntax coloring scripts. + - added extras directory to tarball with nano and vim syntax coloring scripts. - fixed as many bugs as we could :] diff --git a/extras/nano/conky.nanorc b/extras/nano/conky.nanorc index 28d5f4e..d694a71 100644 --- a/extras/nano/conky.nanorc +++ b/extras/nano/conky.nanorc @@ -9,7 +9,7 @@ syntax "conky" "\.*conkyrc.*$" color green "\<(alignment|background|border_margin|border_width|cpu_avg_samples|default_color|default_shade_color|default_outline_color|double_buffer|draw_borders|draw_shades|draw_outline|font|gap_x|gap_y|mail_spool|max_user_text|maximum_width|minimum_size|min_port_monitor_connections|min_port_monitors|mpd_host|mpd_port|mpd_password|net_avg_samples|no_buffers|out_to_console|override_utf8_locale|own_window|own_window_transparent|own_window_type|own_window_hints|own_window_colour|pad_percents|stippled_borders|total_run_times|update_interval|uppercase|use_spacer|use_xft|wm_class_name|xftalpha|xftfont)\>" ## Variables -color brightblue "\<(acpiacadapter|acpifan|acpitemp|acpitempf|addr|adt746xcpu|adt746xfan|align|alignr|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|color|colour|cpu|cpubar|diskio|downspeed|downspeedf|else|exec|execbar|execgraph|execi|execibar|execigraph|font|freq|freq_dyn|freq_dyn_g|freq_g|fs_bar|fs_free|fs_free_perc|fs_size|fs_used|goto|hddtemp|head|hr|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_cpu_tempf|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|if_existing|if_running|if_mounted|kernel|linkstatus|loadavg|machine|mails|mem|membar|memmax|memperc|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_smart|mpd_status|mpd_title|mpd_vol|new_mails|nodename|offset|outlinecolor|pre_exec|processes|running_processes|shadecolor|stippled_hr|swap|swapbar|swapmax|swapperc|sysname|tab|tail|tcp_portmon|texeci|time|top|top_mem|totaldown|totalup|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|voffset)\>" +color brightblue "\<(acpiacadapter|acpifan|acpitemp|acpitempf|addr|adt746xcpu|adt746xfan|align|alignr|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|color|colour|cpu|cpubar|diskio|downspeed|downspeedf|else|exec|execbar|execgraph|execi|execibar|execigraph|font|freq|freq_dyn|freq_dyn_g|freq_g|fs_bar|fs_free|fs_free_perc|fs_size|fs_used|goto|hddtemp|head|hr|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_cpu_tempf|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|if_existing|if_running|if_mounted|kernel|linkstatus|loadavg|machine|mails|mem|membar|memmax|memperc|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_smart|mpd_status|mpd_title|mpd_vol|new_mails|nodename|offset|outlinecolor|pre_exec|processes|running_processes|shadecolor|stippled_hr|swap|swapbar|swapmax|swapperc|sysname|tab|tail|tcp_portmon|texeci|time|top|top_mem|totaldown|totalup|tztime|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|voffset|voltage_mv|voltage_v)\>" color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?" color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" color brightred "^TEXT$" diff --git a/extras/vim/syntax/conkyrc.vim b/extras/vim/syntax/conkyrc.vim index 43a9c02..df53786 100644 --- a/extras/vim/syntax/conkyrc.vim +++ b/extras/vim/syntax/conkyrc.vim @@ -212,6 +212,7 @@ syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipw \ top_mem \ totaldown \ totalup + \ tztime \ updates \ upspeed \ upspeedf @@ -219,6 +220,8 @@ syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipw \ uptime \ uptime_short \ voffset + \ voltage_mv + \ voltage_v hi def link ConkyrcComment Comment hi def link ConkyrcSetting Keyword -- 1.7.9.5