Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 11:00:21 +0000 (06:00 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 11:00:21 +0000 (06:00 -0500)
commit6eca625b774a4bdc782e8b878c8cf05663742101
tree23651e860aa105896ce862462830ec5e00f1e510
parentf14e303adcecf25fa1f116c4040de08a9ed6231b
parent4b00d3b1594378e77b3b485d1ed272be5bdab644
Merge from mainline.
src/window.h
src/xdisp.c