Merge from trunk.
commit275a5dd65098a2d6fcc14c21f805fc8d5e4479ee
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:25:28 +0000 (2 01:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:25:28 +0000 (2 01:25 -0700)
treea03e79b0a7c066940ed02cd11927c7fd4080f092
parent97f4ea979720e535ade3fe0055fb710e18fb7b5d
parentf797625a8ca7bc973b6943c6fce97f1e479a283d
Merge from trunk.
ChangeLog
src/ChangeLog
src/alloc.c
src/lisp.h
src/minibuf.c