Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Apr 2011 18:42:31 +0000 (11:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Apr 2011 18:42:31 +0000 (11:42 -0700)
commit762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a
tree7b2fe40a89bf327ea8b9ad8265a6b6f27cacd2a7
parenteb3f1cc8dfe6a96505f1c5f9174b2712998cb52f
parent8546720e6f25eb988e8215de6678798053031440
Merge from mainline.
ChangeLog
lisp/ChangeLog
src/ChangeLog
src/coding.c
src/keyboard.c
src/lisp.h
src/term.c
src/window.c
src/xdisp.c
src/xterm.c