merge upstream
commitc5082a753011dacef505e91f1fc30a84fa75a2eb
authorJoakim Verona <joakim@verona.se>
Wed, 22 Jun 2011 23:28:30 +0000 (23 01:28 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 22 Jun 2011 23:28:30 +0000 (23 01:28 +0200)
tree2c995eff276b6e9e68f54b4ebe76bf012231c86d
parent787c27e81f046cfa1c457ed405551f8ca0ddb0e8
parent297dde5a97c0c5c8020db72213c7f84067f1ee21
merge upstream
autogen/configure
configure.in
src/dispextern.h
src/dispnew.c
src/emacs.c
src/gtkutil.c
src/insdel.c
src/keyboard.c
src/xdisp.c
src/xfns.c
src/xterm.c