Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 00:39:01 +0000 (17:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 00:39:01 +0000 (17:39 -0700)
commitb1f367f797aa19047904e73a67e52f391c720e0d
treed662146d7e2e99c221fae1cd2fecb0bc6b2b33d3
parent134643946085b24a695d73b3d8f7af5aa23602aa
parent4f8a4547454e24304b4182fbf4ae4b34a7bdc92b
Merge from trunk.
src/ChangeLog
src/xdisp.c