From 92144027915bc2fc9c222d87a8e2e5da3df46c82 Mon Sep 17 00:00:00 2001 From: Eric Ludlam Date: Mon, 18 Jan 2021 12:49:11 -0500 Subject: [PATCH] * lisp/cedet/ede/proj.el: Enable Project files to load (ede-proj-target-makefile): Give more precise type for its `rules` slot. * lisp/cedet/ede/base.el (ede-target-list): Don't define. (ede-project): Use `list-of` instead. --- lisp/cedet/ede/base.el | 5 +---- lisp/cedet/ede/proj.el | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el index 7799746e0c4..810d6ef3bd4 100644 --- a/lisp/cedet/ede/base.el +++ b/lisp/cedet/ede/base.el @@ -160,16 +160,13 @@ and querying them will cause the actual project to get loaded.") ;; Projects can also affect how EDE works, by changing what appears in ;; the EDE menu, or how some keys are bound. ;; -(unless (fboundp 'ede-target-list-p) - (cl-deftype ede-target-list () '(list-of ede-target))) - (defclass ede-project (ede-project-placeholder) ((subproj :initform nil :type list :documentation "Sub projects controlled by this project. For Automake based projects, each directory is treated as a project.") (targets :initarg :targets - :type ede-target-list + :type (list-of ede-target) :custom (repeat (object :objectcreatefcn ede-new-target-custom)) :label "Local Targets" :group (targets) diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el index 59628ebf4c9..4af8b4104f5 100644 --- a/lisp/cedet/ede/proj.el +++ b/lisp/cedet/ede/proj.el @@ -184,7 +184,7 @@ Target variables are always renamed such as foo_CFLAGS, then included into commands where the variable would usually appear.") (rules :initarg :rules :initform nil - :type list + :type (list-of ede-makefile-rule) :custom (repeat (object :objecttype ede-makefile-rule)) :label "Additional Rules" :group (make) -- 2.39.5