merge from upstream
commit4f616a2e7ed1db28da98df90266e9751a8ae9ee1
authorJoakim Verona <joakim@verona.se>
Fri, 15 Jul 2011 02:39:29 +0000 (15 04:39 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 15 Jul 2011 02:39:29 +0000 (15 04:39 +0200)
tree74a9dcbe13e945e712ae04a4a94c2202ca720591
parentff2be00005c3aeda6e11d7ed264ce86f02b60958
parentec2bc542a4d0127425625e8cb458684bd825675a
merge from upstream
configure.in
src/Makefile.in
src/dispextern.h
src/dispnew.c
src/emacs.c
src/gtkutil.c
src/keyboard.c
src/window.c
src/xdisp.c
src/xfns.c