summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaran McCreesh <ciaranm@gentoo.org>2005-01-14 21:56:34 +0000
committerCiaran McCreesh <ciaranm@gentoo.org>2005-01-14 21:56:34 +0000
commit713e26d47115a0460fce9068c8753a025b401c99 (patch)
treefc83277ef359cc30af09fb30c76436f990d1a94f /app-editors/vim-core
parentMarked ~ppc (Manifest recommit) (diff)
downloadgentoo-2-713e26d47115a0460fce9068c8753a025b401c99.tar.gz
gentoo-2-713e26d47115a0460fce9068c8753a025b401c99.tar.bz2
gentoo-2-713e26d47115a0460fce9068c8753a025b401c99.zip
Update vimrc to only try to use ftplugins if we have a valid ftplugin directory (for livecds)
(Portage version: 2.0.51-r12)
Diffstat (limited to 'app-editors/vim-core')
-rw-r--r--app-editors/vim-core/ChangeLog6
-rw-r--r--app-editors/vim-core/Manifest12
-rw-r--r--app-editors/vim-core/files/vimrc7
3 files changed, 11 insertions, 14 deletions
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 22232bc68bbd..aa2416105a43 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/vim-core
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.124 2005/01/13 22:17:07 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.125 2005/01/14 21:56:34 ciaranm Exp $
+
+ 14 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/vimrc:
+ Update vimrc to only try to use ftplugins if we have a valid ftplugin
+ directory (for livecds)
*vim-core-7.0_alpha20050113 (13 Jan 2005)
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index b780dc0d7753..b368b773fdbd 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 c2b9fe6c521d8a744dbefda6e0d53618 ChangeLog 16271
MD5 6e286eb45f52f18b8ba6545bebe593a7 vim-core-6.3-r2.ebuild 904
MD5 551eaa8d97376e39b4f3b0823d43cc01 vim-core-6.3-r1.ebuild 937
@@ -11,16 +8,9 @@ MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
MD5 91fd740a9f563391ade1337d53691bcf vim-core-6.3.ebuild 935
MD5 0559e12807c0742ed95a93dc0d9dc7fb files/digest-vim-core-7.0_alpha20050113 156
MD5 fe3a85b7f303db551bfc5984738e1dfb files/digest-vim-core-6.3-r3 348
-MD5 99fe423ce0bc7bf4f66d4f05c7d553ed files/vimrc 3737
+MD5 2ad354160ca3635ea115beb56e237e7c files/vimrc 3879
MD5 1c089e2955a0cc3a474e86a6ecfb0177 files/digest-vim-core-6.3-r2 348
MD5 c2d0302eae7fc80b2a1cb38ddab9d3d3 files/rphillips-invalcolorpatch.diff 722
MD5 f7046d975c3b2dd7a6e82e4287e6d3ab files/digest-vim-core-6.3 277
MD5 4de696416210fb1651b1835ebf8bd506 files/digest-vim-core-6.2-r9 349
MD5 c8a344d069577df7e39c1f6592827642 files/digest-vim-core-6.3-r1 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB5vOeLLFUmVNQ7rkRAid9AKCmohZZ/o2uQs2rSrQVTRFHuqoTOgCeI0RV
-xO5g1nXYo3VenVXV8n9WkaE=
-=ps+x
------END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/files/vimrc b/app-editors/vim-core/files/vimrc
index ae3bc89d5826..c9c572608a74 100644
--- a/app-editors/vim-core/files/vimrc
+++ b/app-editors/vim-core/files/vimrc
@@ -58,8 +58,11 @@ if &term=="xterm"
set ttymouse=xterm2 " only works for >=xfree86-3.3.3, should be okay
endif
-" Enable plugin-provided filetype settings
-filetype plugin on
+" Enable plugin-provided filetype settings, but only if the ftplugin
+" directory exists (which it won't on livecds, for example).
+if isdirectory(expand("$VIMRUNTIME/ftplugin"))
+ filetype plugin on
+endif
" Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided
" indent settings. Some people don't like these, so we won't turn them on by