diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-17 13:05:34 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-17 13:05:40 +0200 |
| commit | 0161a4ae09b4269a14143808cfa44a6fd02790df (patch) | |
| tree | 089e93053ccea1bab10b21a2fa25dc574602357a /lisp | |
| parent | 7bf65920342b3e7ccc6386d037081192452bf1a9 (diff) | |
| download | emacs-0161a4ae09b4269a14143808cfa44a6fd02790df.tar.gz | |
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'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/cedet/ede/base.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio-custom.el | 3 |
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 @@ ;; The TARGET is an entity in a project that knows about files ;; and features of those files. -(defclass ede-target (eieio-speedbar-directory-button) +(defclass ede-target (eieio-speedbar-directory-button eieio-named) ((buttonface :initform speedbar-file-face) ;override for superclass (name :initarg :name :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." (car (widget-apply (car chil) :value-inline)))) (setq chil (cdr chil)))))) ;; Set any name updates on it. - (if name (eieio-object-set-name-string obj name)) + (when name + (setf (slot-value obj 'object-name) name)) ;; This is the same object we had before. obj)) |