From: Glenn Morris <rgm@gnu.org>
Date: Tue, 9 Oct 2018 20:12:56 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4317
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=641d98531ef7177d9ff0cf6f7362c7ff5ad2fc1c;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

2cae1cf Further fix to eieio-persistent
---

641d98531ef7177d9ff0cf6f7362c7ff5ad2fc1c