From: Stephen Leake Date: Sun, 13 Sep 2015 13:59:07 +0000 (-0500) Subject: Fix bugs in eieio-oref-default related to class symbols X-Git-Tag: emacs-25.0.90~1224^2~113 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6a792bc623afacea9702f7ec3a35a56013f6c71;p=emacs.git Fix bugs in eieio-oref-default related to class symbols * lisp/emacs-lisp/eieio-core.el (class-p): Handle symbol properly. (eieio-oref-default): Handle class properly. --- diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index f97667c3689..e3f7b11bb64 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -769,7 +769,8 @@ Fills in OBJ's SLOT with its default value." (cl-check-type obj (or eieio-object class)) (cl-check-type slot symbol) (let* ((cl (cond ((symbolp obj) (cl--find-class obj)) - (t (eieio--object-class obj)))) + ((eieio-object-p obj) (eieio--object-class obj)) + (t obj))) (c (eieio--slot-name-index cl slot))) (if (not c) ;; It might be missing because it is a :class allocated slot.