aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-06-17 13:05:34 +0200
committerLars Ingebrigtsen2019-06-17 13:05:40 +0200
commit0161a4ae09b4269a14143808cfa44a6fd02790df (patch)
tree089e93053ccea1bab10b21a2fa25dc574602357a
parent7bf65920342b3e7ccc6386d037081192452bf1a9 (diff)
downloademacs-0161a4ae09b4269a14143808cfa44a6fd02790df.tar.gz
emacs-0161a4ae09b4269a14143808cfa44a6fd02790df.zip
Fix compilation warning by having ede-target inherit from eieio-named
* lisp/cedet/ede/base.el (ede-target): Inherit from eieio-named so that if you're customizing objects via eieio-object-value-get, you can set the name. * lisp/emacs-lisp/eieio-custom.el (eieio-object-value-get): Don't use obsolete function `eieio-object-set-name-string'.
-rw-r--r--lisp/cedet/ede/base.el2
-rw-r--r--lisp/emacs-lisp/eieio-custom.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index 57973ffd13b..a4e2464fd8d 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -46,7 +46,7 @@
46;; The TARGET is an entity in a project that knows about files 46;; The TARGET is an entity in a project that knows about files
47;; and features of those files. 47;; and features of those files.
48 48
49(defclass ede-target (eieio-speedbar-directory-button) 49(defclass ede-target (eieio-speedbar-directory-button eieio-named)
50 ((buttonface :initform speedbar-file-face) ;override for superclass 50 ((buttonface :initform speedbar-file-face) ;override for superclass
51 (name :initarg :name 51 (name :initarg :name
52 :type string 52 :type string
diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index c9a8129a45e..78fab90b0f3 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -317,7 +317,8 @@ Optional argument IGNORE is an extraneous parameter."
317 (car (widget-apply (car chil) :value-inline)))) 317 (car (widget-apply (car chil) :value-inline))))
318 (setq chil (cdr chil)))))) 318 (setq chil (cdr chil))))))
319 ;; Set any name updates on it. 319 ;; Set any name updates on it.
320 (if name (eieio-object-set-name-string obj name)) 320 (when name
321 (setf (slot-value obj 'object-name) name))
321 ;; This is the same object we had before. 322 ;; This is the same object we had before.
322 obj)) 323 obj))
323 324