Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:38:05 +0000 (10:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:38:05 +0000 (10:38 -0700)
commit2b64ccd2b5916083a421b0263a5bc1d3d075d82b
treecd80e7dbca2a0bf71687688188d701fa61d52608
parent82d66f4e89f12f5c5eb6e4a4f80745a69da6b710
parent077e3dda9478f958acb9c9d5b98e0f739726dea7
Merge from trunk.
ChangeLog
configure.in
src/ChangeLog
src/xdisp.c