From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 1 Jan 2017 09:02:48 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~967
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88b65c6357f91b9080ab4b8ca398ddd6203c3247;p=emacs.git

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

88b65c6357f91b9080ab4b8ca398ddd6203c3247