rename dir

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@743 7f574dfc-610e-0410-a909-a81674777703

diff --git a/extras/nano/README b/extras/nano/README
new file mode 100644 (file)
index 0000000..5ab4859
--- /dev/null
+++ b/extras/nano/README
@@ -0,0 +1,2 @@
+Append the contents of conky.nanorc to your $HOME/.nanorc for nano 
+syntax coloring of your $HOME/.conkyrc file.

diff --git a/extras/nano/conky.nanorc b/extras/nano/conky.nanorc
new file mode 100644 (file)
index 0000000..28d5f4e
--- /dev/null
+++ b/extras/nano/conky.nanorc
@@ -0,0 +1,18 @@
+##
+## Syntax highlighting for conky .rc files.
+##
+## $Id$
+##
+syntax "conky" "\.*conkyrc.*$"
+
+## Configuration items
+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 "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color brightred "^TEXT$"
+
+## Values
+color yellow "\<(above|below|bottom_left|bottom_right|desktop|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|undecorated|yes)\>"

diff --git a/extras/vim/README b/extras/vim/README
new file mode 100644 (file)
index 0000000..3416521
--- /dev/null
+++ b/extras/vim/README
@@ -0,0 +1,9 @@
+Vim filetype detection and syntax highlighting scripts for conky.
+
+Individual users can place them your personal .vim directory:
+
+~/.vim/ftdetect/conkyrc.vim
+~/.vim/syntax/conkyrc.vim
+
+Refer to your vim site documentation for system-wide installation.
+

diff --git a/extras/vim/ftdetect/conkyrc.vim b/extras/vim/ftdetect/conkyrc.vim
new file mode 100644 (file)
index 0000000..00041f2
--- /dev/null
+++ b/extras/vim/ftdetect/conkyrc.vim
@@ -0,0 +1,5 @@
+" Vim filetype detection file for Conky config files
+"
+" $Id$
+
+au BufNewFile,BufRead *conkyrc set filetype=conkyrc

diff --git a/extras/vim/syntax/conkyrc.vim b/extras/vim/syntax/conkyrc.vim
new file mode 100644 (file)
index 0000000..43a9c02
--- /dev/null
+++ b/extras/vim/syntax/conkyrc.vim
@@ -0,0 +1,234 @@
+" 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
+"
+" $Id$
+
+if exists("b:current_syntax")
+  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 ConkyrcConstant 
+        \ above
+        \ below
+        \ bottom_left
+        \ bottom_right
+       \ desktop
+        \ no
+        \ none
+       \ normal
+       \ override
+        \ skip_pager
+        \ skip_taskbar
+        \ sticky
+        \ top_left
+        \ top_right
+        \ undecorated
+        \ yes
+
+syn match ConkyrcNumber /\S\@<!\d\+\(\.\d\+\)\?\(\S\@!\|}\@=\)/
+      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
+syn match ConkyrcColour /\S\@<!#[a-fA-F0-9]\{6\}\(\S\@!\|}\@=\)/
+      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
+
+syn region ConkyrcText start=/^TEXT$/ end=/\%$/ contains=ConkyrcVar
+
+syn region ConkyrcVar start=/\${/ end=/}/ contained contains=ConkyrcVarStuff
+syn region ConkyrcVar start=/\$\w\@=/ end=/\W\@=\|$/ contained contains=ConkyrcVarName
+
+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
+
+hi def link ConkyrcComment   Comment
+hi def link ConkyrcSetting   Keyword
+hi def link ConkyrcConstant  Constant
+hi def link ConkyrcNumber    Number
+hi def link ConkyrcColour    Special
+
+hi def link ConkyrcText      String
+hi def link ConkyrcVar       Identifier
+hi def link ConkyrcVarName   Keyword
+
+let b:current_syntax = "conkyrc"
+

diff --git a/syntax/nano/README b/syntax/nano/README
deleted file mode 100644 (file)
index 5ab4859..0000000
--- a/syntax/nano/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Append the contents of conky.nanorc to your $HOME/.nanorc for nano 
-syntax coloring of your $HOME/.conkyrc file.

diff --git a/syntax/nano/conky.nanorc b/syntax/nano/conky.nanorc
deleted file mode 100644 (file)
index 28d5f4e..0000000
--- a/syntax/nano/conky.nanorc
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## Syntax highlighting for conky .rc files.
-##
-## $Id$
-##
-syntax "conky" "\.*conkyrc.*$"
-
-## Configuration items
-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 "\$\{?[0-9A-Z_!@#$*?-]+\}?"
-color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color brightred "^TEXT$"
-
-## Values
-color yellow "\<(above|below|bottom_left|bottom_right|desktop|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|undecorated|yes)\>"

diff --git a/syntax/vim/README b/syntax/vim/README
deleted file mode 100644 (file)
index 3416521..0000000
--- a/syntax/vim/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Vim filetype detection and syntax highlighting scripts for conky.
-
-Individual users can place them your personal .vim directory:
-
-~/.vim/ftdetect/conkyrc.vim
-~/.vim/syntax/conkyrc.vim
-
-Refer to your vim site documentation for system-wide installation.
-

diff --git a/syntax/vim/ftdetect/conkyrc.vim b/syntax/vim/ftdetect/conkyrc.vim
deleted file mode 100644 (file)
index 00041f2..0000000
--- a/syntax/vim/ftdetect/conkyrc.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Vim filetype detection file for Conky config files
-"
-" $Id$
-
-au BufNewFile,BufRead *conkyrc set filetype=conkyrc

diff --git a/syntax/vim/syntax/conkyrc.vim b/syntax/vim/syntax/conkyrc.vim
deleted file mode 100644 (file)
index 43a9c02..0000000
--- a/syntax/vim/syntax/conkyrc.vim
+++ /dev/null
@@ -1,234 +0,0 @@
-" 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
-"
-" $Id$
-
-if exists("b:current_syntax")
-  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 ConkyrcConstant 
-        \ above
-        \ below
-        \ bottom_left
-        \ bottom_right
-       \ desktop
-        \ no
-        \ none
-       \ normal
-       \ override
-        \ skip_pager
-        \ skip_taskbar
-        \ sticky
-        \ top_left
-        \ top_right
-        \ undecorated
-        \ yes
-
-syn match ConkyrcNumber /\S\@<!\d\+\(\.\d\+\)\?\(\S\@!\|}\@=\)/
-      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
-syn match ConkyrcColour /\S\@<!#[a-fA-F0-9]\{6\}\(\S\@!\|}\@=\)/
-      \ nextgroup=ConkyrcNumber,ConkyrcColour skipwhite
-
-syn region ConkyrcText start=/^TEXT$/ end=/\%$/ contains=ConkyrcVar
-
-syn region ConkyrcVar start=/\${/ end=/}/ contained contains=ConkyrcVarStuff
-syn region ConkyrcVar start=/\$\w\@=/ end=/\W\@=\|$/ contained contains=ConkyrcVarName
-
-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
-
-hi def link ConkyrcComment   Comment
-hi def link ConkyrcSetting   Keyword
-hi def link ConkyrcConstant  Constant
-hi def link ConkyrcNumber    Number
-hi def link ConkyrcColour    Special
-
-hi def link ConkyrcText      String
-hi def link ConkyrcVar       Identifier
-hi def link ConkyrcVarName   Keyword
-
-let b:current_syntax = "conkyrc"
-