Let eieio-persistent-read read what object-write has written

* lisp/emacs-lisp/eieio-base.el (eieio-persistent-validate/fix-slot-value):
  `object-write' may quote lists inside hash tables and vectors, so
  unquote those lists here.

This patch allows the eieio-persistent write/restore process to
perform a clean round trip. It only handles a very specific and
limited range of object structures, but at least the write and read
procedures match.

diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index af240794e38ca1909cf0be9c451baa963ed6d586..5ff8574d9a92b3737b6c3fa56e1a0414ff780636 100644 (file)
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -360,19 +360,28 @@ Second, any text properties will be stripped from strings."
         ((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))))
+            (cond ((class-p (car-safe value))
+                   (setf (gethash key proposed-value)
+                         (eieio-persistent-convert-list-to-object
+                          value)))
+                  ((and (consp value)
+                        (eq (car value) 'quote))
+                   (setf (gethash key proposed-value)
+                         (cadr 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)))))
+           (let ((val (aref proposed-value i)))
+            (cond ((class-p (car-safe val))
+                   (aset proposed-value i
+                         (eieio-persistent-convert-list-to-object
+                          (aref proposed-value i))))
+                  ((and (consp val)
+                        (eq (car val) 'quote))
+                   (aset proposed-value i
+                         (cadr val))))))
          proposed-value)
 
         ((stringp proposed-value)