Merge from trunk.
commit3c4ca7155293ffc2d04708007131bcbc882d8913
authorEli Zaretskii <eliz@gnu.org>
Tue, 13 Nov 2012 14:17:18 +0000 (13 16:17 +0200)
committerEli Zaretskii <eliz@gnu.org>
Tue, 13 Nov 2012 14:17:18 +0000 (13 16:17 +0200)
tree61787be8cd43b6fb3d5159852fbd186eea404de7
parent5ade42a5114255c43117065494b96d480c1e1588
parentc708524567662c8911c5ab2695acc7bda0383705
Merge from trunk.
12 files changed:
lisp/ChangeLog
lisp/subr.el
src/ChangeLog
src/emacs.c
src/keyboard.c
src/lisp.h
src/makefile.w32-in
src/termhooks.h
src/w32fns.c
src/w32proc.c
src/w32term.c
src/w32term.h