Add VIM_PLUGIN_VIM_VERSION to the app-vim/ ebuild template.

Add g:loaded_* guard variables to plugin/* to prevent loading them more than once. This makes it easier to test them by adding them to your ~/.vim/ directory w/o having to remove the system-wide ones.

svn path=/trunk/gentoo-syntax/; revision=40

6 files changed, 23 insertions, 5 deletions

diff --git a/doc/gentoo-syntax.txt b/doc/gentoo-syntax.txt
index 5328a39..2748c0f 100644
--- a/doc/gentoo-syntax.txt
+++ b/doc/gentoo-syntax.txt
@@ -273,6 +273,13 @@ Authors:  Ciaran McCreesh <ciaranm at gentoo dot org>
 ==============================================================================
 3. ChangeLog					     *gentoo-syntax-changelog*
 
+	20070514 pioto
+	    * Add VIM_PLUGIN_VIM_VERSION to the app-vim/ ebuild template.
+	    * Add g:loaded_* guard variables to plugin/* to prevent loading
+	      them more than once. This makes it easier to test them by adding
+	      them to your ~/.vim/ directory w/o having to remove the
+	      system-wide ones.
+
 	20070506 pioto
 	    * Eclasses don't need to specify ECLASS or INHERITED anymore. See
 	      Bug #175135.
diff --git a/plugin/bugsummary.vim b/plugin/bugsummary.vim
index 3c12788..00d4a24 100644
--- a/plugin/bugsummary.vim
+++ b/plugin/bugsummary.vim
@@ -14,10 +14,12 @@
 " Configuration options:
 "   :let g:bugsummary_browser="firefox '%s'"
 
-if &compatible || v:version < 603
+if &compatible || v:version < 603 || exists("g:loaded_bugsummary")
     finish
 endif
 
+let g:loaded_bugsummary=1
+
 fun! <SID>strip(s)
     return substitute(a:s, "\\n", "", "g")
 endfun
diff --git a/plugin/gentoo-common.vim b/plugin/gentoo-common.vim
index 6fa083c..aaf7976 100644
--- a/plugin/gentoo-common.vim
+++ b/plugin/gentoo-common.vim
@@ -4,10 +4,12 @@
 " Copyright:    Copyright (c) 2005 Ciaran McCreesh
 " Licence:      You may redistribute this under the same terms as Vim itself
 
-if &compatible || v:version < 603
+if &compatible || v:version < 603 || exists("g:loaded_gentoo_common")
     finish
 endif
 
+let g:loaded_gentoo_common=1
+
 fun! GentooGetUser()
     let l:result = expand("\$ECHANGELOG_USER")
     if l:result ==# "\$ECHANGELOG_USER"
diff --git a/plugin/newebuild.vim b/plugin/newebuild.vim
index 8c3313c..7821fbf 100644
--- a/plugin/newebuild.vim
+++ b/plugin/newebuild.vim
@@ -4,10 +4,12 @@
 " Copyright:    Copyright (c) 2004-2005 Ciaran McCreesh
 " Licence:      You may redistribute this under the same terms as Vim itself
 
-if &compatible || v:version < 603
+if &compatible || v:version < 603 || exists("g:loaded_newebuild")
     finish
 endif
 
+let g:loaded_newebuild=1
+
 runtime! plugin/gentoo-common.vim
 
 fun! <SID>MakeNewEbuild()
@@ -42,6 +44,7 @@ fun! <SID>MakeNewEbuild()
     else
         if l:category ==# "app-vim"
             " {{{ app-vim special setup
+            put ='#VIM_PLUGIN_VIM_VERSION=\"7.0\"'
             put ='inherit vim-plugin'
             put =''
             put ='DESCRIPTION=\"vim plugin: \"'
diff --git a/plugin/newinitd.vim b/plugin/newinitd.vim
index 045cc94..d11c0a5 100644
--- a/plugin/newinitd.vim
+++ b/plugin/newinitd.vim
@@ -4,10 +4,12 @@
 " Copyright:	Copyright (c) 2005 Aaron Walker
 " License:	You may redistribute this under the same terms as Vim itself
 
-if &compatible || v:version < 603
+if &compatible || v:version < 603 || exists("g:loaded_newinitd")
     finish
 endif
 
+let g:loaded_newinitd=1
+
 runtime! plugin/gentoo-common.vim
 
 fun! <SID>MakeNewInitd()
diff --git a/plugin/newmetadata.vim b/plugin/newmetadata.vim
index 81df9cd..ce5e433 100644
--- a/plugin/newmetadata.vim
+++ b/plugin/newmetadata.vim
@@ -4,10 +4,12 @@
 " Copyright:    Copyright (c) 2004-2005 Ciaran McCreesh
 " Licence:      You may redistribute this under the same terms as Vim itself
 
-if &compatible || v:version < 603
+if &compatible || v:version < 603 || exists("g:loaded_newmetadata")
     finish
 endif
 
+let g:loaded_newmetadata=1
+
 runtime! plugin/gentoo-common.vim
 
 fun! <SID>MakeNewMetadata()