Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 17:48:19 +0000 (10:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 17:48:19 +0000 (10:48 -0700)
commit4c0078d4ab7fa8c234fa8098ec3a9686199edbff
tree94584f6a647d7d9ab5da97842dcc37e75d6c03fe
parentd311d28c3f8a3c43e6ef33d68b852c5ea7f13239
parente233ce558d12fdf9e0e69ea30c4558ec7477fea4
Merge from trunk.
src/ChangeLog
src/bidi.c
src/dispextern.h
src/fileio.c
src/lread.c
src/search.c
src/xdisp.c
src/xfns.c
src/xmenu.c