Merge from trunk.
commitc3b9a83ed346d1f0c9ab9f0776b527c74e3ca971
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 00:21:29 +0000 (5 17:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 00:21:29 +0000 (5 17:21 -0700)
tree04ac5617e8feb4ed4de3f650cdbdbee0af36b627
parentd9f0172e44ae854a422fd52555f9535ed57f2392
parentd747b53feb3e403571c724cc5add1e5e354f4408
Merge from trunk.
src/xdisp.c