Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 8 Jan 2010 20:59:09 +0000 (15:59 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 8 Jan 2010 20:59:09 +0000 (15:59 -0500)
commitf14e303adcecf25fa1f116c4040de08a9ed6231b
treefb366e58925d597963b4d1a89b6267d2047794f0
parent4dad464f19edf1b77ce23d27baec0e06960a4865
parent5075d8535904317a9dff2ff3eebbc7540cc587c0
Merge from mainline.
src/dispnew.c