[Emacs-diffs] master 2fddfb7: Handle object string name in eieio-persistent-convert-list-object

[Eric Abrahamsen]

branch: master
commit 2fddfb7ce770f61313f058c7a899c2fbce055d21
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    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.
---
 lisp/emacs-lisp/eieio-base.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 8ad1603..74fad83 100644
--- 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