aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-06-16 16:29:52 +0200
committerLars Ingebrigtsen2019-06-16 16:29:52 +0200
commit56eb4f7f115bd43fd7e655224ef101aff0c04714 (patch)
treeef63ec8fbfe1ddaf5ff671cb52c340cdcf881ed8
parent7bbb56bc430465a6807a8129a322c704c89e3eba (diff)
downloademacs-56eb4f7f115bd43fd7e655224ef101aff0c04714.tar.gz
emacs-56eb4f7f115bd43fd7e655224ef101aff0c04714.zip
Revert "Fix compilation warning in ede.el"
This reverts commit 7bbb56bc430465a6807a8129a322c704c89e3eba. The commit led to a bootstrap error.
-rw-r--r--lisp/cedet/ede.el2
-rw-r--r--lisp/cedet/ede/auto.el2
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."
791 )) 791 ))
792 (inits (oref obj initializers))) 792 (inits (oref obj initializers)))
793 ;; Force the name to match for new objects. 793 ;; Force the name to match for new objects.
794 (setf (slot-value nobj 'object-name) (oref nobj name)) 794 (eieio-object-set-name-string nobj (oref nobj name))
795 ;; Handle init args. 795 ;; Handle init args.
796 (while inits 796 (while inits
797 (eieio-oset nobj (car inits) (car (cdr inits))) 797 (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.")
136(declare-function ede-directory-safe-p "ede") 136(declare-function ede-directory-safe-p "ede")
137(declare-function ede-add-project-to-global-list "ede") 137(declare-function ede-add-project-to-global-list "ede")
138 138
139(defclass ede-project-autoload (eieio-named) 139(defclass ede-project-autoload ()
140 ((name :initarg :name 140 ((name :initarg :name
141 :documentation "Name of this project type") 141 :documentation "Name of this project type")
142 (file :initarg :file 142 (file :initarg :file