detect conky.conf as well as conkyrc for syntax highlighting

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

diff --git a/extras/nano/conky.nanorc b/extras/nano/conky.nanorc
index 368e0be..bc221ca 100644 (file)
--- a/extras/nano/conky.nanorc
+++ b/extras/nano/conky.nanorc
@@ -3,7 +3,7 @@
 ##
 ## $Id$
 ##
-syntax "conky" "\.*conkyrc.*$"
+syntax "conky" "(\.*conkyrc.*$|conky.conf)"
 
 ## 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_graph_borders|draw_shades|draw_outline|font|gap_x|gap_y|imap|mail_spool|max_port_monitor_connections|max_specials|max_user_text|maximum_width|minimum_size|mpd_host|mpd_port|mpd_password|music_player_interval|net_avg_samples|no_buffers|out_to_console|override_utf8_locale|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|stippled_borders|total_run_times|update_interval|uppercase|use_spacer|use_xft|xftalpha|xftfont)\>"

diff --git a/extras/vim/ftdetect/conkyrc.vim b/extras/vim/ftdetect/conkyrc.vim
index 00041f2..f413af0 100644 (file)
--- a/extras/vim/ftdetect/conkyrc.vim
+++ b/extras/vim/ftdetect/conkyrc.vim
@@ -3,3 +3,4 @@
 " $Id$
 
 au BufNewFile,BufRead *conkyrc set filetype=conkyrc
+au BufNewFile,BufRead conky.conf set filetype=conkyrc