Merge from origin/emacs-26
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 9 Dec 2017 09:13:02 +0000 (10:13 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 9 Dec 2017 09:13:02 +0000 (10:13 +0100)
1fdac2d65c Don't add newlines in minibuffer history
de68f337e3 modhelp.py: Support Python 3 (Bug#24954)
afb04f7f3c Use forward slashes for python w32 config example (Bug#21656)

1  2 
lisp/simple.el

diff --cc lisp/simple.el
Simple merge