Merge from trunk.
commit358e1dd2b2e984069dc761ee4266efdad33a213f
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 05:11:36 +0000 (13 22:11 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 05:11:36 +0000 (13 22:11 -0700)
tree24932c1e3dd81a084d9c0434868de7d72024f0ba
parent3019ceda0d720be62102bd76d52cfcab67ac012a
parent377538cbcf8c1f0aab9b40ed2ff3df414904272f
Merge from trunk.
src/xdisp.c