From 57318c701227d786143cdcf28a96b8b4d68859e8 Mon Sep 17 00:00:00 2001 From: Nikolas Garofil Date: Wed, 4 Jun 2008 08:33:01 +0000 Subject: [PATCH] Background was defined twice in vim and nano syntax git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1125 7f574dfc-610e-0410-a909-a81674777703 --- extras/nano/conky.nanorc | 2 +- extras/vim/syntax/conkyrc.vim | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/extras/nano/conky.nanorc b/extras/nano/conky.nanorc index b432121..39906bc 100644 --- a/extras/nano/conky.nanorc +++ b/extras/nano/conky.nanorc @@ -6,7 +6,7 @@ syntax "conky" "(\.*conkyrc.*$|conky.conf)" ## Configuration items -color green "\<(alignment|background|background|show_graph_scale|border_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|default_color|default_shade_color|default_shadecolor|default_outline_color|default_outlinecolor|imap|pop3|mpd_host|mpd_port|mpd_password|music_player_interval|sensor_device|cpu_avg_samples|net_avg_samples|double_buffer|override_utf8_locale|draw_borders|draw_graph_borders|draw_shades|draw_outline|out_to_console|use_spacer|use_xft|font|xftalpha|xftfont|use_xft|gap_x|gap_y|mail_spool|minimum_size|maximum_width|no_buffers|top_cpu_separate|short_units|pad_percents|own_window|own_window_class|own_window_title|own_window_transparent|own_window_colour|own_window_hints|own_window_type|stippled_borders|temp1|temp2|update_interval|total_run_times|uppercase|max_specials|max_user_text|text_buffer_size|max_port_monitor_connections)\>" +color green "\<(alignment|background|show_graph_scale|border_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|default_color|default_shade_color|default_shadecolor|default_outline_color|default_outlinecolor|imap|pop3|mpd_host|mpd_port|mpd_password|music_player_interval|sensor_device|cpu_avg_samples|net_avg_samples|double_buffer|override_utf8_locale|draw_borders|draw_graph_borders|draw_shades|draw_outline|out_to_console|use_spacer|use_xft|font|xftalpha|xftfont|use_xft|gap_x|gap_y|mail_spool|minimum_size|maximum_width|no_buffers|top_cpu_separate|short_units|pad_percents|own_window|own_window_class|own_window_title|own_window_transparent|own_window_colour|own_window_hints|own_window_type|stippled_borders|temp1|temp2|update_interval|total_run_times|uppercase|max_specials|max_user_text|text_buffer_size|max_port_monitor_connections)\>" ## Configuration item constants color yellow "\<(above|below|bottom_left|bottom_right|bottom_middle|desktop|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|undecorated|yes)\>" diff --git a/extras/vim/syntax/conkyrc.vim b/extras/vim/syntax/conkyrc.vim index 0a40211..f9ed2a7 100644 --- a/extras/vim/syntax/conkyrc.vim +++ b/extras/vim/syntax/conkyrc.vim @@ -16,7 +16,6 @@ syn region ConkyrcComment start=/^\s*#/ end=/$/ syn keyword ConkyrcSetting \ alignment \ background - \ background \ show_graph_scale \ border_margin \ border_width -- 1.7.9.5