Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Dec 2011 00:56:50 +0000 (16:56 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Dec 2011 00:56:50 +0000 (16:56 -0800)
commit8f50130c565eaf0ad7c49e4ad044c3291ecdfa71
treec8129448cbbf387fe82667ccac02983592c688f1
parent85a83e2e2585a1906dec5168ed96ad521b5849ed
parent7b9d523a07395ecea505be88f45c33d73aea7038
Merge from trunk.
56 files changed:
src/ChangeLog
src/alloc.c
src/bidi.c
src/buffer.c
src/buffer.h
src/callint.c
src/casetab.c
src/ccl.c
src/character.c
src/character.h
src/charset.c
src/chartab.c
src/coding.c
src/coding.h
src/data.c
src/dbusbind.c
src/dired.c
src/dispextern.h
src/dispnew.c
src/emacs.c
src/eval.c
src/fileio.c
src/fns.c
src/font.c
src/font.h
src/fontset.c
src/frame.c
src/fringe.c
src/ftfont.c
src/gtkutil.c
src/image.c
src/intervals.c
src/keyboard.c
src/lisp.h
src/lread.c
src/minibuf.c
src/nsfns.m
src/nsfont.m
src/print.c
src/process.c
src/puresize.h
src/search.c
src/sound.c
src/sysdep.c
src/term.c
src/textprop.c
src/w32fns.c
src/w32menu.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xmenu.c
src/xselect.c
src/xterm.c
src/xterm.h