Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:25 +0000 (12:18 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Thu, 7 Jul 2011 16:18:25 +0000 (12:18 -0400)
commit412f24b9ddf1e07022f8c5fe05f0717f130c4c02
treecf8450140b0907d14ac4dbdcf025f033a992bc98
parentaf0905c84a232b034b4f792847aa05531f8cdefc
parent15fa4783a39e7a8d99cc6b5e783307c08b25a823
Merge from emacs-23 branch
src/ChangeLog
src/composite.c
src/xdisp.c