Merge from trunk.
commit86f3178890f56cb408949e125d5d99e3124dd48f
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:45:07 +0000 (30 22:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:45:07 +0000 (30 22:45 -0700)
treea2c5f15751bbfe701d2f0da6fab0e0ea1fefc8ce
parent12c69b84d1ab93d5b0bd189394952da12340f86d
parentb9627cfb1d5b5b0914525a19cd9edb06f91a1665
Merge from trunk.
ChangeLog
src/ChangeLog
src/alloc.c
src/lisp.h
src/minibuf.c
src/xterm.c