From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 9 Dec 2017 09:13:02 +0000 (+0100)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6075
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=836168a65b63fa32f60bbf211e4238bde49e1f01;p=emacs.git

Merge from origin/emacs-26

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)
---

836168a65b63fa32f60bbf211e4238bde49e1f01