Merge from mainline.
commit8bd7b8304a41da5dc0c8a11967c1a6005e9465d0
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Apr 2011 20:16:48 +0000 (14 13:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Apr 2011 20:16:48 +0000 (14 13:16 -0700)
tree145588110166df723c31f3fceaa00c190b77aa8c
parentcd64ea1d0df393beb93d1bdf19bd3990e3378f85
parent9024ff7943e9529ec38a80aaaa0db43224c1e885
Merge from mainline.
src/ChangeLog
src/alloc.c
src/charset.c
src/fileio.c
src/keyboard.c
src/lisp.h
src/sound.c
src/sysdep.c
src/xdisp.c
src/xfns.c
src/xsettings.c