Merge from trunk.

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/makefile.w32-in
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32proc.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/w32term.h
Simple merge