From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Sun, 22 Oct 2017 14:59:29 +0000 (-0700)
Subject: Handle object string name in eieio-persistent-convert-list-object
X-Git-Tag: emacs-26.0.91~354
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a215be999454b8f0118141d4e4f6cf58298f79e0;p=emacs.git

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 e3501be6c1d..e718bdf21f4 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