Handle object string name in eieio-persistent-convert-list-object

* lisp/emacs-lisp/eieio-base.el (eieio-persistent-convert-list-to-object):
  Starting to phase out the printing of object names in
  `object-write', handle either case.

diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 8ad16038bcae2317c83b15b2754091f9f0dc2847..74fad83ec20ad55f57ecbdf898b23667a19b5cd0 100644 (file)
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -256,8 +256,11 @@ malicious code.
 Note: This function recurses when a slot of :type of some object is
 identified, and needing more object creation."
   (let* ((objclass (nth 0 inputlist))
-        ;; (objname (nth 1 inputlist))
-        (slots (nthcdr 2 inputlist))
+         ;; Earlier versions of `object-write' added a string name for
+         ;; the object, now obsolete.
+         (slots (nthcdr
+                 (if (stringp (nth 1 inputlist) 2 1)
+                     inputlist)))
         (createslots nil)
         (class
          (progn