summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-03-02 19:25:11 +0000
committerUlrich Müller <ulm@gentoo.org>2010-03-02 19:25:11 +0000
commitf3a5b096b15fe791b605292a847ac988270b5eb1 (patch)
treee540da678d81d17ae59f477a7eadc7a978dc080c /app-emacs
parentVersion bump KDE 4.4.1 (diff)
downloadgentoo-2-f3a5b096b15fe791b605292a847ac988270b5eb1.tar.gz
gentoo-2-f3a5b096b15fe791b605292a847ac988270b5eb1.tar.bz2
gentoo-2-f3a5b096b15fe791b605292a847ac988270b5eb1.zip
Use "require" instead of "load" in site-init file, bug 307321.
(Portage version: 2.2_rc63/cvs/Linux i686)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/cedet/ChangeLog6
-rw-r--r--app-emacs/cedet/files/50cedet-gentoo.el2
2 files changed, 6 insertions, 2 deletions
diff --git a/app-emacs/cedet/ChangeLog b/app-emacs/cedet/ChangeLog
index b63c45755c9b..08e201bfc384 100644
--- a/app-emacs/cedet/ChangeLog
+++ b/app-emacs/cedet/ChangeLog
@@ -1,6 +1,10 @@
# 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.49 2010/02/27 10:30:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/ChangeLog,v 1.50 2010/03/02 19:25:10 ulm Exp $
+
+ 02 Mar 2010; Ulrich Mueller <ulm@gentoo.org> files/50cedet-gentoo.el:
+ Use "require" instead of "load", in order to make the site-init file
+ idempotent, bug 307321.
*cedet-1.0_pre7 (27 Feb 2010)
diff --git a/app-emacs/cedet/files/50cedet-gentoo.el b/app-emacs/cedet/files/50cedet-gentoo.el
index 231f65a2b3c7..cf69334e4f6c 100644
--- a/app-emacs/cedet/files/50cedet-gentoo.el
+++ b/app-emacs/cedet/files/50cedet-gentoo.el
@@ -1,4 +1,4 @@
-(load "@SITELISP@/common/cedet" nil t)
+(require 'cedet "@SITELISP@/common/cedet")
(add-to-list 'image-load-path "@SITEETC@/common/icons" t)
(add-to-list 'image-load-path "@SITEETC@/cogre" t)
(setq srecode-map-load-path