Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 16:13:07 +0000 (09:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 16:13:07 +0000 (09:13 -0700)
commit5fc295a42feaef453b57010b826e589b9b9cb7dd
tree8a965da92c7ebc7d78c04d2dbc220a6bbe40e094
parentfcbc5f60ee9c1ed2fb8b8b4f36b8a0658250a1bd
parent7254299e4d19b0acdfc5dd7580c24be817731488
Merge from trunk.
src/ChangeLog
src/xdisp.c