Merge from trunk.
commit0d8de0fd0a5a63cc9558b5c99f9c7f1ddcaf338a
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 20:33:28 +0000 (19 13:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 20:33:28 +0000 (19 13:33 -0700)
tree31cf6b0a22ba1ee37fef321a296eb288828dc4c6
parentc2216f8e3a2a17ba5b843f0329ce52c920a336b2
parent590bd46743151a55ba68a7d211f82b2485c57d3a
Merge from trunk.
src/ChangeLog
src/alloc.c
src/fileio.c
src/lread.c
src/xdisp.c