; Merge from origin/emacs-25

The following commits were skipped:

e8f0d7d Backport: Remove an ambiguity from defvar's doc string.  Fixe...
af1b102 * lisp/emacs-lisp/inline.el: Fix apply-conversion (bug#25280)
This commit is contained in:
Paul Eggert 2017-01-01 01:02:48 -08:00
commit 88b65c6357

Diff content is not available