; Merge from origin/emacs-26

The following commits were skipped:

3c83c9e Fix Bug#31704.  Do not merge
de7644d Fix Bug#31704.  Do not merge
This commit is contained in:
Glenn Morris 2018-12-30 16:57:36 -08:00
commit f23b1db37a

Diff content is not available