summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-10-17 07:14:09 +0000
committerUlrich Müller <ulm@gentoo.org>2010-10-17 07:14:09 +0000
commit5ea482267912940022ffa8a491507cdc9c3ec2aa (patch)
treec4762a391643b42a7b8b46a7bbc7e7a2cf23d663 /app-emacs
parentgames-server/greenhouse is gone (diff)
downloadhistorical-5ea482267912940022ffa8a491507cdc9c3ec2aa.tar.gz
historical-5ea482267912940022ffa8a491507cdc9c3ec2aa.tar.bz2
historical-5ea482267912940022ffa8a491507cdc9c3ec2aa.zip
Test if image-load-path exists in site-init file, fixes bug 341377.
Package-Manager: portage-2.1.9.19/cvs/Linux x86_64
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/cedet/ChangeLog5
-rw-r--r--app-emacs/cedet/Manifest10
-rw-r--r--app-emacs/cedet/files/50cedet-gentoo.el5
3 files changed, 12 insertions, 8 deletions
diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index 781391e24fdd..a6397d1e2101 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/cedet
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.61 2010/10/14 17:05:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.62 2010/10/17 07:14:09 ulm Exp $
+
+ 16 Oct 2010; Ulrich Mueller <ulm@gentoo.org> files/50cedet-gentoo.el:
+ Test if image-load-path exists in site-init file, fixes bug 341377.
14 Oct 2010; Ulrich Mueller <ulm@gentoo.org> -cedet-1.0_pre6.ebuild,
-cedet-1.0_pre7-r1.ebuild, -files/cedet-1.0_pre6-fix-eieio-comp.patch,
diff --git a/app-emacs/cedet/Manifest b/app-emacs/cedet/Manifest
index 2f19b571c771..14a70e7fa4f4 100644
--- a/app-emacs/cedet/Manifest
+++ b/app-emacs/cedet/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX 50cedet-gentoo.el 519 RMD160 23d1339390986080f21b23f64a72ef79196be625 SHA1 492d18330ea8ad416cb24bb7145c300ca78c20a5 SHA256 4d55c2ebd679c6825087453925c5488e2c732a84cc8fd3cec5c081da5eb9f395
+AUX 50cedet-gentoo.el 556 RMD160 b7f5cb7631c0eb1bdea6cfa7e320fb127f9769d6 SHA1 e5dcd163996d7a3c3e8eaf74f7ce6d10da8ba2b8 SHA256 a6fb7de601604f95bfd5800ebf01a599debb848d3dfdc21b74eb22869a1627e1
DIST cedet-1.0.tar.gz 2100938 RMD160 a3703cb76f21468a1d218a091599441ca9aa5d11 SHA1 bc3c7c22465f79df603fb6bb5684442a439f198e SHA256 f0d5c76d22a8d7dceaccb659be094c44cb999eae75db3545eef086d8dcd342f4
EBUILD cedet-1.0.ebuild 2282 RMD160 9e47995f5e6e3ddcd722642e42aacdbd18938137 SHA1 6552f8c4177f125483bdc264d7fe83441313d11d SHA256 06f3a253e5229bdbc63f6dbe6e958183b0269a19385dd4caa6a97756f364ec0a
-MISC ChangeLog 8681 RMD160 88058ed77bcb69508938b22b400869748b8c9bf5 SHA1 cfec39c43c6f9de0e3b0a8efe33b0430e5d40a07 SHA256 fbe8fa9c95b3146ae28a054bb26267462d0354dc774da10af2f659fce64fa7f4
+MISC ChangeLog 8824 RMD160 568eaf7e4cbd6945cbf8a6054123f695b6c93fb9 SHA1 14c567bf85490b9a354094b007f99adde1437ab1 SHA256 bc60181be381ce159619dcac746682aa9beeaf6fa9da2c193da1165fd5171d00
MISC metadata.xml 831 RMD160 742d588c9f37c4639acf627470e88e8da5c9e8c4 SHA1 315ec457e01f99f17211cf7229a17caec0ff3bf6 SHA256 3ef03457bb7af19d84fdd463e7a780ee79fa2812f5bd04fe5b15064d648b2999
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAky3OO4ACgkQOeoy/oIi7uzQzgCeLPlMbbEcbeYO2dUi0cy1s5xM
-BI4An2lmWSn1UWy77HabCn+j9bWu+nVV
-=9imH
+iEYEARECAAYFAky6osgACgkQOeoy/oIi7uxM2wCfew+ElnHAW/TCxcTK1K07neS7
+yV4Anjp6Ta5neE8V6WLnUjeRaaDKG4L3
+=lbjT
-----END PGP SIGNATURE-----
diff --git a/app-emacs/cedet/files/50cedet-gentoo.el b/app-emacs/cedet/files/50cedet-gentoo.el
index cf69334e4f6c..600ad3ba7e96 100644
--- a/app-emacs/cedet/files/50cedet-gentoo.el
+++ b/app-emacs/cedet/files/50cedet-gentoo.el
@@ -1,6 +1,7 @@
(require 'cedet "@SITELISP@/common/cedet")
-(add-to-list 'image-load-path "@SITEETC@/common/icons" t)
-(add-to-list 'image-load-path "@SITEETC@/cogre" t)
+(when (boundp 'image-load-path)
+ (add-to-list 'image-load-path "@SITEETC@/common/icons" t)
+ (add-to-list 'image-load-path "@SITEETC@/cogre" t))
(setq srecode-map-load-path
(list "@SITEETC@/srecode/templates"
"@SITEETC@/ede/templates"