summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/eieio-base.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp/eieio-base.el')
-rw-r--r--lisp/emacs-lisp/eieio-base.el20
1 files changed, 20 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index f11056faecc..a07e1f13acf 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -354,6 +354,26 @@ Second, any text properties will be stripped from strings."
proposed-value))
(t
proposed-value))))
+ ;; For hash-tables and vectors, the top-level `read' will not
+ ;; "look inside" member values, so we need to do that
+ ;; explicitly.
+ ((hash-table-p proposed-value)
+ (maphash
+ (lambda (key value)
+ (when (class-p (car-safe value))
+ (setf (gethash key proposed-value)
+ (eieio-persistent-convert-list-to-object
+ value))))
+ proposed-value)
+ proposed-value)
+
+ ((vectorp proposed-value)
+ (dotimes (i (length proposed-value))
+ (when (class-p (car-safe (aref proposed-value i)))
+ (aset proposed-value i
+ (eieio-persistent-convert-list-to-object
+ (aref proposed-value i)))))
+ proposed-value)
((stringp proposed-value)
;; Else, check for strings, remove properties.