From 3bfd7fcfdbc411e2f426f5ead4ea6430dd481c5b Mon Sep 17 00:00:00 2001 From: David Holm Date: Tue, 21 Jan 2014 21:58:54 +0100 Subject: [PATCH] Do not attempt to load CEDET if eieio has been loaded CEDET will generate an error if it is loaded after the eieio version that is shipped with Emacs has been loaded. During bootstrapping this will continuously cause my Emacs to stop installing packages and forcing me to restart it. This change will ensure that Emacs can be fully bootstrapped using el-get even if the updated version of CEDET is installed. The new version will simply be loaded on the next launch. --- recipes/cedet.rcp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/cedet.rcp b/recipes/cedet.rcp index 5c499c9c..879bfecf 100644 --- a/recipes/cedet.rcp +++ b/recipes/cedet.rcp @@ -23,5 +23,8 @@ ;; setup. :lazy nil :post-init - (unless (featurep 'cedet-devel-load) + (if (or (featurep 'cedet-devel-load) + (featurep 'eieio)) + (message (concat "Emacs' built-in CEDET has already been loaded! Restart" + " Emacs to load CEDET from el-get instead.")) (load (expand-file-name "cedet-devel-load.el" pdir))))