summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Abrahamsen <eric@ericabrahamsen.net>2017-12-28 18:14:47 -0800
committerEric Abrahamsen <eric@ericabrahamsen.net>2017-12-28 18:14:47 -0800
commitbf4f34ac7de6abe9a0ec1cd248b6936f5e764077 (patch)
tree80855f882620d07b449c1a1fc0977a71cf4080a3
parent1ea9947ca318979bac0cc6d54263faf3fb09d587 (diff)
downloademacs-bf4f34ac7de6abe9a0ec1cd248b6936f5e764077.tar.gz
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.
-rw-r--r--lisp/emacs-lisp/eieio-base.el25
1 files changed, 17 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index e166a2859a4..2794f88f1f0 100644
--- 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)