Merge from mainline.
commit2db38a6f98c2abb42b746064ce97417cccc27e68
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 11:59:23 +0000 (16 06:59 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 11:59:23 +0000 (16 06:59 -0500)
tree73303f99dc5f8f5eb35dd862a35e6a6609f085fa
parent1db6ebe40405dec23b51eb8015c58be0bc46fe13
parente118d2be3b70097e71c0be4d0fc1f88b0fb39e88
parentf5700c5e7e4f0b5b4d3a1d187328e9e8078ef22d
Merge from mainline.
src/Makefile.in
src/buffer.c
src/buffer.h
src/dispextern.h
src/dispnew.c
src/term.c
src/window.h
src/xdisp.c