Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:40:45 +0000 (23:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:40:45 +0000 (23:40 -0700)
commit70c60eb2f9e5120f609ba5b6f2d82eef26d21c15
tree4bf1faef485f8aa5d4cb535021fe356d200a3c88
parent252c5ee166b0b5dd82aa1976ae01db704c146a2b
parentd747b53feb3e403571c724cc5add1e5e354f4408
parenta29eb766a697b646103c4cc8ab56795acce7beab
Merge from trunk.
src/ChangeLog
src/bidi.c
src/composite.c
src/dispextern.h
src/editfns.c
src/ftfont.c
src/process.c
src/xdisp.c
src/xfaces.c