merge from upstream
commita7513ade3bc0fe79430d5541d88c9dcda0932bec
authorJoakim Verona <joakim@verona.se>
Wed, 15 Jun 2011 22:22:07 +0000 (16 00:22 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 15 Jun 2011 22:22:07 +0000 (16 00:22 +0200)
tree4383951ba698a11e9f8933a9d8c72e00aa872a10
parent4bd51ad5c3445b644dfb017d5b57b10a90aa325f
parent4bba86e6210a74326e843a8fdc8409127105e1fe
merge from upstream
15 files changed:
autogen/configure
configure.in
src/Makefile.in
src/dispextern.h
src/dispnew.c
src/emacs.c
src/frame.h
src/gtkutil.c
src/insdel.c
src/keyboard.c
src/termhooks.h
src/window.c
src/xdisp.c
src/xfns.c
src/xterm.c