Merge from mainline.
commit4ef23ecf04ac996a938f9fb0107efbc60fdc63e4
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 06:44:06 +0000 (18 23:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 06:44:06 +0000 (18 23:44 -0700)
treecd7d2c42dea5fbad0d790d12b6e284992790b7e9
parentfa3c87e1f21cd100ccb257d5dd41047d0c9a732b
parentbc4f7f3d586a8d32718e27e99226d1b5ab091db5
Merge from mainline.
src/ChangeLog
src/xdisp.c