From 840252dfa9123892859457737d4be26baf40c90a Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Tue, 29 Nov 2016 21:25:13 -0500 Subject: [PATCH] Don't use builtin CEDET by default Users installing CEDET via el-get probably wanted the git version. For those who want the builtin, they can add (:name cedet :builtin "23.3") to `el-get-sources'. Also move the :post-init block to :prepare so that the :lazy nil hack becomes redundant. --- recipes/cedet.rcp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/recipes/cedet.rcp b/recipes/cedet.rcp index bc055cfda..72bdf57db 100644 --- a/recipes/cedet.rcp +++ b/recipes/cedet.rcp @@ -1,5 +1,7 @@ (:name cedet - :builtin "23.3" + ;; While CEDET is builtin since Emacs 23.3, CEDET users + ;; probably want the latest from git. + ;; :builtin "23.3" :website "http://cedet.sourceforge.net/" :description "CEDET is a Collection of Emacs Development Environment Tools written with the end goal of creating an advanced development environment in Emacs." :type git @@ -17,12 +19,7 @@ ("gmake" ,(format "EMACS=%s" (shell-quote-argument el-get-emacs)) "-C" "contrib")) :build/windows-nt `(("sh" "-c" "touch `/usr/bin/find . -name Makefile` && make FIND=/usr/bin/find")) - :features nil - ;; This package isn't really non-lazy, but we want to call the - ;; post-init immediately, because it handles the lazy autoload - ;; setup. - :lazy nil - :post-init + :prepare (if (or (featurep 'cedet-devel-load) (featurep 'eieio)) (message (concat "Emacs' built-in CEDET has already been loaded! Restart"