]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Wed, 10 Apr 2019 16:07:16 +0000 (09:07 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 10 Apr 2019 16:07:16 +0000 (09:07 -0700)
5999401 (origin/emacs-26) Note that choose-completion-string-function...
8d2f1df Address name conflicts in EIEIO documentation (bug#31660)

1  2 
lisp/simple.el

diff --cc lisp/simple.el
Simple merge