[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b6a792b 1/2: Fix bugs in eieio-oref-default related
From: |
Stephen Leake |
Subject: |
[Emacs-diffs] master b6a792b 1/2: Fix bugs in eieio-oref-default related to class symbols |
Date: |
Tue, 15 Sep 2015 19:45:28 +0000 |
branch: master
commit b6a792bc623afacea9702f7ec3a35a56013f6c71
Author: Stephen Leake <address@hidden>
Commit: Stephen Leake <address@hidden>
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.
---
lisp/emacs-lisp/eieio-core.el | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index f97667c..e3f7b11 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.