From 56eb4f7f115bd43fd7e655224ef101aff0c04714 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 16 Jun 2019 16:29:52 +0200 Subject: [PATCH] Revert "Fix compilation warning in ede.el" This reverts commit 7bbb56bc430465a6807a8129a322c704c89e3eba. The commit led to a bootstrap error. --- lisp/cedet/ede.el | 2 +- lisp/cedet/ede/auto.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index d051510a994..22374dd6a63 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -791,7 +791,7 @@ Optional argument NAME is the name to give this project." )) (inits (oref obj initializers))) ;; Force the name to match for new objects. - (setf (slot-value nobj 'object-name) (oref nobj name)) + (eieio-object-set-name-string nobj (oref nobj name)) ;; Handle init args. (while inits (eieio-oset nobj (car inits) (car (cdr inits))) diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el index 402562b7c4e..4871d51bc64 100644 --- a/lisp/cedet/ede/auto.el +++ b/lisp/cedet/ede/auto.el @@ -136,7 +136,7 @@ into memory.") (declare-function ede-directory-safe-p "ede") (declare-function ede-add-project-to-global-list "ede") -(defclass ede-project-autoload (eieio-named) +(defclass ede-project-autoload () ((name :initarg :name :documentation "Name of this project type") (file :initarg :file -- 2.39.2