Merge from origin/emacs-25
commit9bec2fb3c19968a673f761c55057c4dbc9d907be
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:46 +0000 (1 01:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:46 +0000 (1 01:02 -0800)
tree2ce695d1512d61e55318d1d2ad775b3c0073b4f7
parent37b01efe2041999963db839ddf5dc94698e1da61
parent4179238fa8047837c545227c6e538fb43afaa4ff
Merge from origin/emacs-25

4179238 Improve documentation of 'w32-scroll-lock-modifier'
doc/emacs/msdos.texi
src/w32fns.c