Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 15:03:25 +0000 (08:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 15:03:25 +0000 (08:03 -0700)
commit3019ceda0d720be62102bd76d52cfcab67ac012a
treea65cd8607a71db61b0a9539b2f8121dee6c18de8
parentc3b9a83ed346d1f0c9ab9f0776b527c74e3ca971
parent75b771e489a32ab716b031664baee313a78caf6b
Merge from trunk.
src/xdisp.c