From: Glenn Morris <rgm@gnu.org>
Date: Wed, 10 Apr 2019 16:07:16 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~3261^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61cdadf5bc211749002508b0597bb1239024f0d4;p=emacs.git

Merge from origin/emacs-26

5999401 (origin/emacs-26) Note that choose-completion-string-function...
8d2f1df Address name conflicts in EIEIO documentation (bug#31660)
---

61cdadf5bc211749002508b0597bb1239024f0d4