; Merge from origin/emacs-25

The following commit was skipped:

a3487a8 Fix bug#25087
This commit is contained in:
Paul Eggert 2016-12-07 12:41:05 -08:00
commit 33a2f93aad

Diff content is not available