Merge pull request #1530 from dholm/bugfix/cedet

Do not attempt to load CEDET if eieio has been loaded
This commit is contained in:
Dimitri Fontaine 2014-01-22 15:36:24 -08:00
commit 8bbd69a7db

View File

@ -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))))