Commit 61cdadf5 authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

59994015 (origin/emacs-26) Note that choose-completion-string-function...
8d2f1df5 Address name conflicts in EIEIO documentation (bug#31660)
parents fe552f69 59994015
Pipeline #1238 failed with stage
in 50 minutes and 36 seconds