aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-06-16 16:39:28 +0200
committerLars Ingebrigtsen2019-06-16 16:39:28 +0200
commit6697cbf8f85b197828ec8a63bcd1698e9a08bcac (patch)
tree9e12ea36ce418a3f2d5127234d968e68b3150605
parent56eb4f7f115bd43fd7e655224ef101aff0c04714 (diff)
downloademacs-6697cbf8f85b197828ec8a63bcd1698e9a08bcac.tar.gz
emacs-6697cbf8f85b197828ec8a63bcd1698e9a08bcac.zip
Fix compilation warning in ede.el
* lisp/cedet/ede/auto.el (ede-project-autoload): Inherit from eieio-named, because we want to set the object name... * lisp/cedet/ede.el (ede-new): ... which we do here, and fix the compilation warning about the obsolete eieio-object-set-name-string function.
-rw-r--r--lisp/cedet/ede.el2
-rw-r--r--lisp/cedet/ede/auto.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 22374dd6a63..d051510a994 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 (eieio-object-set-name-string nobj (oref nobj name)) 794 (setf (slot-value nobj 'object-name) (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 4871d51bc64..099d60fffa7 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -31,6 +31,7 @@
31 31
32(require 'eieio) 32(require 'eieio)
33(require 'cl-generic) 33(require 'cl-generic)
34(require 'eieio-base)
34 35
35(declare-function ede-directory-safe-p "ede") 36(declare-function ede-directory-safe-p "ede")
36(declare-function ede-add-project-to-global-list "ede") 37(declare-function ede-add-project-to-global-list "ede")
@@ -136,7 +137,7 @@ into memory.")
136(declare-function ede-directory-safe-p "ede") 137(declare-function ede-directory-safe-p "ede")
137(declare-function ede-add-project-to-global-list "ede") 138(declare-function ede-add-project-to-global-list "ede")
138 139
139(defclass ede-project-autoload () 140(defclass ede-project-autoload (eieio-named)
140 ((name :initarg :name 141 ((name :initarg :name
141 :documentation "Name of this project type") 142 :documentation "Name of this project type")
142 (file :initarg :file 143 (file :initarg :file