From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Tue, 19 Dec 2017 22:56:13 +0000 (-0800)
Subject: Handle possible classtype values in eieio-persistent-read
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ea9947ca318979bac0cc6d54263faf3fb09d587;p=emacs.git

Handle possible classtype values in eieio-persistent-read

* lisp/emacs-lisp/eieio-base.el (eieio-persistent-validate/fix-slot-value):
  The function `eieio-persistent-slot-type-is-class-p' could return
  either a single class, or a list of classes.
---

diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index a07e1f13acf..e166a2859a4 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -349,7 +349,7 @@ Second, any text properties will be stripped from strings."
                        (seq-some
                         (lambda (elt)
                           (child-of-class-p (car proposed-value) elt))
-                        classtype))
+                        (if (listp classtype) classtype (list classtype))))
 		  (eieio-persistent-convert-list-to-object
 		   proposed-value))
 		 (t