X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=extras%2Fvim%2Fsyntax%2Fconkyrc.vim;h=3ca9a0c6661b59c2f5f11c620016c1443e51e30b;hb=aad43bea8d3840babb502d939be324ba49c3b74e;hp=43a9c022c6e3b0a43962cf7dfbee459966831aea;hpb=ef9255e22b263a25dc5979fb619644e69f90aec6;p=monky

diff --git a/extras/vim/syntax/conkyrc.vim b/extras/vim/syntax/conkyrc.vim
index 43a9c02..3ca9a0c 100644
--- a/extras/vim/syntax/conkyrc.vim
+++ b/extras/vim/syntax/conkyrc.vim
@@ -1,86 +1,46 @@
 " Vim syntax file
-" Language:	conkyrc
-" Author:	Ciaran McCreesh <ciaranm@gentoo.org>
-" Version:	20060307
-" Copyright:	Copyright (c) 2005 Ciaran McCreesh
-" Licence:	You may redistribute this under the same terms as Vim itself
+" Language:   conkyrc
+" Author:     Ciaran McCreesh <ciaranm@gentoo.org>
+" Version:    20060307
+" Copyright:  Copyright (c) 2005 Ciaran McCreesh
+" Licence:    You may redistribute this under the same terms as Vim itself
 "
-" $Id$
 
 if exists("b:current_syntax")
-  finish
+	finish
 endif
 
 syn region ConkyrcComment start=/^\s*#/ end=/$/
 
-syn keyword ConkyrcSetting
-        \ alignment
-        \ background
-        \ border_margin
-        \ border_width
-        \ cpu_avg_samples
-        \ default_color
-        \ default_outline_color
-        \ default_shade_color
-        \ double_buffer
-        \ draw_borders
-        \ draw_graph_borders
-        \ draw_outline
-        \ draw_shades
-        \ font
-        \ gap_x
-        \ gap_y
-        \ mail_spool
-	\ max_user_text
-        \ maximum_width
-        \ minimum_size
-        \ min_port_monitor_connections
-        \ min_port_monitors
-        \ mpd_host
-        \ mpd_password
-        \ mpd_port
-        \ net_avg_samples
-        \ no_buffers
-        \ out_to_console
-        \ override_utf8_locale
-        \ own_window
-        \ own_window_colour
-        \ own_window_hints
-        \ own_window_transparent
-	\ own_window_type
-        \ pad_percents
-        \ stippled_borders
-        \ total_run_times
-        \ update_interval
-        \ uppercase
-        \ use_spacer
-        \ use_xft
-        \ wm_class_name
-        \ xftalpha
-        \ xftfont
+syn keyword ConkyrcSetting alignment append_file background border_inner_margin border_outer_margin border_width color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 colorN cpu_avg_samples default_bar_size default_color default_gauge_size default_graph_size default_outline_color default_shade_color diskio_avg_samples display double_buffer draw_borders draw_graph_borders draw_outline draw_shades extra_newline font format_human_readable gap_x gap_y if_up_strictness imap imlib_cache_flush_interval imlib_cache_size lua_draw_hook_post lua_draw_hook_pre lua_load lua_shutdown_hook lua_startup_hook mail_spool max_port_monitor_connections max_specials max_user_text maximum_width minimum_size mpd_host mpd_password mpd_port music_player_interval net_avg_samples no_buffers out_to_console out_to_ncurses out_to_stderr out_to_x override_utf8_locale overwrite_file own_window own_window_class own_window_colour own_window_hints own_window_title own_window_transparent own_window_type pad_percents pop3 sensor_device short_units show_graph_range show_graph_scale stippled_borders temperature_unit template template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 text text_buffer_size top_cpu_separate top_name_width total_run_times update_interval update_interval_on_battery uppercase use_spacer use_xft xftalpha xftfont
 
-syn keyword ConkyrcConstant 
-        \ above
-        \ below
-        \ bottom_left
-        \ bottom_right
-	\ desktop
-        \ no
-        \ none
-	\ normal
-	\ override
-        \ skip_pager
-        \ skip_taskbar
-        \ sticky
-        \ top_left
-        \ top_right
-        \ undecorated
-        \ yes
+syn keyword ConkyrcConstant
+			\ above
+			\ below
+			\ bottom_left
+			\ bottom_right
+			\ bottom_middle
+			\ desktop
+			\ dock
+			\ no
+			\ none
+			\ normal
+			\ override
+			\ skip_pager
+			\ skip_taskbar
+			\ sticky
+			\ top_left
+			\ top_right
+			\ top_middle
+			\ middle_left
+			\ middle_right
+			\ undecorated
+			\ yes
 
 syn match ConkyrcNumber /\S\@<!\d\+\(\.\d\+\)\?\(\S\@!\|}\@=\)/
-      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
+			\ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
 syn match ConkyrcColour /\S\@<!#[a-fA-F0-9]\{6\}\(\S\@!\|}\@=\)/
-      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
+			\ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
 
 syn region ConkyrcText start=/^TEXT$/ end=/\%$/ contains=ConkyrcVar
 
@@ -89,136 +49,7 @@ syn region ConkyrcVar start=/\$\w\@=/ end=/\W\@=\|$/ contained contains=ConkyrcV
 
 syn match ConkyrcVarStuff /{\@<=/ms=s contained nextgroup=ConkyrcVarName
 
-syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
-	\ acpiacadapter 
-	\ acpifan 
-	\ acpitemp 
-	\ acpitempf 
-      	\ addr 
-	\ adt746xcpu
-      	\ adt746xfan 
-	\ alignc 
-	\ 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_mounted 
-	\ if_running 
-	\ 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
+syn keyword ConkyrcVarName contained nextgroup=ConkyrcNumber,ConkyrcColour skipwhite acpiacadapter acpifan acpitemp addr addrs adt746xcpu adt746xfan alignc alignr apcupsd apcupsd_cable apcupsd_charge apcupsd_lastxfer apcupsd_linev apcupsd_load apcupsd_loadbar apcupsd_loadgauge apcupsd_loadgraph apcupsd_model apcupsd_name apcupsd_status apcupsd_temp apcupsd_timeleft apcupsd_upsmode apm_adapter apm_battery_life apm_battery_time audacious_bar audacious_bitrate audacious_channels audacious_filename audacious_frequency audacious_length audacious_length_seconds audacious_main_volume audacious_playlist_length audacious_playlist_position audacious_position audacious_position_seconds audacious_status audacious_title battery battery_bar battery_percent battery_short battery_time blink bmpx_album bmpx_artist bmpx_bitrate bmpx_title bmpx_track bmpx_uri buffers cached color color0 color1 color2 color3 color4 color5 color6 color7 color8 color9 combine conky_build_arch conky_build_date conky_version cpu cpubar cpugauge cpugraph curl desktop desktop_name desktop_number disk_protect diskio diskio_read diskio_write diskiograph diskiograph_read diskiograph_write downspeed downspeedf downspeedgraph draft_mails else endif entropy_avail entropy_bar entropy_perc entropy_poolsize eval eve exec execbar execgauge execgraph execi execibar execigauge execigraph execp execpi flagged_mails font forwarded_mails freq freq_g fs_bar fs_bar_free fs_free fs_free_perc fs_size fs_type fs_used fs_used_perc goto gw_iface gw_ip hddtemp head hr hwmon i2c i8k_ac_status i8k_bios i8k_buttons_status i8k_cpu_temp i8k_left_fan_rpm i8k_left_fan_status i8k_right_fan_rpm i8k_right_fan_status i8k_serial i8k_version ibm_brightness ibm_fan ibm_temps ibm_volume iconv_start iconv_stop if_empty if_existing if_gw if_match if_mixer_mute if_mounted if_mpd_playing if_running if_smapi_bat_installed if_up if_updatenr if_xmms2_connected image imap_messages imap_unseen include ioscheduler kernel laptop_mode lines loadavg loadgraph lua lua_bar lua_gauge lua_graph lua_parse machine mails mboxscan mem membar memeasyfree memfree memgauge memgraph memmax memperc mixer mixerbar mixerl mixerlbar mixerr mixerrbar moc_album moc_artist moc_bitrate moc_curtime moc_file moc_rate moc_song moc_state moc_timeleft moc_title moc_totaltime monitor monitor_number mpd_album mpd_artist mpd_bar mpd_bitrate mpd_elapsed mpd_file mpd_length mpd_name mpd_percent mpd_random mpd_repeat mpd_smart mpd_status mpd_title mpd_track mpd_vol nameserver new_mails nodename nvidia obsd_product obsd_sensors_fan obsd_sensors_temp obsd_sensors_volt obsd_vendor offset outlinecolor pb_battery platform pop3_unseen pop3_used pre_exec processes read_tcp replied_mails rss running_processes scroll seen_mails shadecolor smapi smapi_bat_bar smapi_bat_perc smapi_bat_power smapi_bat_temp sony_fanspeed stippled_hr swap swapbar swapfree swapmax swapperc sysname tab tail tcp_portmon template0 template1 template2 template3 template4 template5 template6 template7 template8 template9 texeci threads time to_bytes top top_io top_mem top_time totaldown totalup trashed_mails tztime unflagged_mails unforwarded_mails unreplied_mails unseen_mails updates upspeed upspeedf upspeedgraph uptime uptime_short user_names user_number user_terms user_times utime voffset voltage_mv voltage_v weather wireless_ap wireless_bitrate wireless_essid wireless_link_bar wireless_link_qual wireless_link_qual_max wireless_link_qual_perc wireless_mode words xmms2_album xmms2_artist xmms2_bar xmms2_bitrate xmms2_comment xmms2_date xmms2_duration xmms2_elapsed xmms2_genre xmms2_id xmms2_percent xmms2_playlist xmms2_size xmms2_smart xmms2_status xmms2_timesplayed xmms2_title xmms2_tracknr xmms2_url
 
 hi def link ConkyrcComment   Comment
 hi def link ConkyrcSetting   Keyword
@@ -231,4 +62,3 @@ hi def link ConkyrcVar       Identifier
 hi def link ConkyrcVarName   Keyword
 
 let b:current_syntax = "conkyrc"
-