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
commit92fa7dc5be86b06e1684fac19584ed4331c9d090 (patch)
tree297c7e00abf5b99b36b306b229fd655461812e75 /app-emacs/cedet
parentgames-server/greenhouse is gone (diff)
downloadgentoo-2-92fa7dc5be86b06e1684fac19584ed4331c9d090.tar.gz
gentoo-2-92fa7dc5be86b06e1684fac19584ed4331c9d090.tar.bz2
gentoo-2-92fa7dc5be86b06e1684fac19584ed4331c9d090.zip
Test if image-load-path exists in site-init file, fixes bug 341377.
(Portage version: 2.1.9.19/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs/cedet')
-rw-r--r--app-emacs/cedet/ChangeLog5
-rw-r--r--app-emacs/cedet/files/50cedet-gentoo.el5
2 files changed, 7 insertions, 3 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/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"