diff options
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)) |