From: Glenn Morris <rgm@gnu.org>
Date: Sun, 11 Jun 2017 23:20:41 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~521^2~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=030df01c7cbdcccc7b3e3b987303b51072cd8137;p=emacs.git

Merge from origin/emacs-25

e80f6a210b0 Describe problems with Microsoft Intellipoint
a73ec1edb07 More accurate documentation of the ':box' face attribute
---

030df01c7cbdcccc7b3e3b987303b51072cd8137