summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/eieio-base.el
diff options
context:
space:
mode:
authorEric Abrahamsen <eric@ericabrahamsen.net>2017-10-22 07:59:29 -0700
committerEric Abrahamsen <eric@ericabrahamsen.net>2017-11-08 09:28:07 -0800
commita215be999454b8f0118141d4e4f6cf58298f79e0 (patch)
tree3992f34c1e253611ebd3bb343ab3207fad061aee /lisp/emacs-lisp/eieio-base.el
parent255ba01148f69f452937e67feb7af5d4c1466fed (diff)
downloademacs-a215be999454b8f0118141d4e4f6cf58298f79e0.tar.gz
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.
Diffstat (limited to 'lisp/emacs-lisp/eieio-base.el')
-rw-r--r--lisp/emacs-lisp/eieio-base.el7
1 files changed, 5 insertions, 2 deletions
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