Merge from trunk.
commitb33f9238e98872b413c01f1ee1a1a74fe217eeb1
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 00:58:07 +0000 (3 17:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 00:58:07 +0000 (3 17:58 -0700)
tree186b31010f9ed3f3ce6dfadc15807d01bc3f45a5
parent9a70f03d70e44db2ec9c6d2952cb8a1deae15000
parent19fe0c2e44466a0b9457ef11d23ce0b6e18baa99
Merge from trunk.
src/xdisp.c