Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 07:15:21 +0000 (23:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 07:15:21 +0000 (23:15 -0800)
commit9898bd0e5b0e51ce9040e11ae25c9a07ec08eb4f
tree25387ffdec4119c749c9317c55d185cf39cfcb3f
parent3616c8b26bfaf024d803371b85bee571cd6f061f
parent2071918ec9a1562d5f0aa6218d98f80318a33466
parent61ccba97a11dd945138a5459955456ebb19b9e74
Merge from trunk.
48 files changed:
src/ChangeLog
src/alloc.c
src/buffer.c
src/bytecode.c
src/callproc.c
src/ccl.c
src/character.c
src/charset.c
src/charset.h
src/chartab.c
src/coding.c
src/coding.h
src/composite.c
src/composite.h
src/data.c
src/dired.c
src/dispextern.h
src/dispnew.c
src/doprnt.c
src/emacs.c
src/font.c
src/font.h
src/fontset.c
src/frame.c
src/frame.h
src/gtkutil.c
src/image.c
src/indent.c
src/insdel.c
src/intervals.c
src/intervals.h
src/keyboard.c
src/keymap.c
src/lisp.h
src/nsfns.m
src/process.c
src/sound.c
src/w32fns.c
src/w32menu.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xfont.c
src/xmenu.c
src/xselect.c
src/xterm.c
src/xterm.h