Merge from trunk.
commitbc81e2c4e885787603da3e0314d6ea45a43f7862
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 18:48:49 +0000 (16 11:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 18:48:49 +0000 (16 11:48 -0700)
treec3da7331f40c60b0ebb434d15f83ce027188d5e9
parenta69fbedbd629c3e46a23095486617482fb1228c5
parentb215eee57d8427ac896f42a9546930cd852a1637
Merge from trunk.
src/ChangeLog
src/xdisp.c