Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 07:06:04 +0000 (00:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 07:06:04 +0000 (00:06 -0700)
commit7f5515125fbc9b46454e1f84b7e3052a0a5326f0
tree13a6cb94930aab84d48a35cfd93cbbd16244ce5c
parent3f791afed9cd1002b909cefd3482763b2a310608
parent2d43b8c9716af32033eb778d3fabb1a47dd44535
Merge from trunk.
ChangeLog
configure.in
src/ChangeLog
src/callint.c
src/emacs.c
src/sysdep.c
src/xdisp.c