Merge from trunk.
commit51cab52b054aaf178743aa7775ae29e934eeba9c
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 00:59:02 +0000 (20 17:59 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 00:59:02 +0000 (20 17:59 -0700)
tree0160ac7e20237f3a337fc35c9ba368762ef9203c
parent171e2a582e4c7d6bfd6d6ff0373720b59568bcb2
parentca5307394f6861fc825434c268e0a44adf8a3252
Merge from trunk.
src/ChangeLog
src/fns.c
src/process.c
src/xdisp.c