summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorEric Abrahamsen <eric@ericabrahamsen.net>2017-10-22 07:59:29 -0700
committerEric Abrahamsen <eric@ericabrahamsen.net>2017-10-22 07:59:29 -0700
commit2fddfb7ce770f61313f058c7a899c2fbce055d21 (patch)
treeabc121bcbaede4d45e8352c22af234906e33f7b7 /lisp/emacs-lisp
parentcda4c74e60962a49908d130f6dd70b0ae90a0255 (diff)
downloademacs-2fddfb7ce770f61313f058c7a899c2fbce055d21.tar.gz
emacs-2fddfb7ce770f61313f058c7a899c2fbce055d21.tar.bz2
emacs-2fddfb7ce770f61313f058c7a899c2fbce055d21.zip
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')
-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 8ad16038bca..74fad83ec20 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