Merger from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 23 Jan 2010 08:49:15 +0000 (03:49 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 23 Jan 2010 08:49:15 +0000 (03:49 -0500)
commit151b77c2684759f6f883c012ce8469b68741b6eb
treeff092a00d753e8c643512f4de972759e6f11ee86
parent46ee4cb48102fd75ce20609692a7e3ee058cb630
parent3d782998caa47e69de96807eb9deee2b9aa1d9d1
Merger from mainline.
src/xdisp.c