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

Merge from origin/emacs-25

4179238 Improve documentation of 'w32-scroll-lock-modifier'
---

9bec2fb3c19968a673f761c55057c4dbc9d907be