; Merge from origin/emacs-26
commitd5ccb74848658d20a7b31ea3a2bf5a090468fd5d
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:26 +0000 (8 19:22 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:26 +0000 (8 19:22 -0800)
tree0612e1b84922cc43eeed5ea219104d4c5985cbdf
parent6ee827059463e4b95c9251ef22a21f9c67cf668d
parenta215be999454b8f0118141d4e4f6cf58298f79e0
; Merge from origin/emacs-26

The following commit was skipped:

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