Merge from trunk.
commitcfc09582247ffef6a46b6249e2fba9136a62d21e
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 06:38:24 +0000 (22 23:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 06:38:24 +0000 (22 23:38 -0700)
tree50e102f64a2b88c692d9110990abd416c78c32f0
parent92c938895c639463681ae1c58a944cae62b70b87
parent86c606818495d9411fd5d6b1477f9a097eb18020
Merge from trunk.
src/ChangeLog
src/bidi.c
src/dispextern.h
src/editfns.c
src/xdisp.c