Merge from trunk.
commit35cf62d95cdcd5323dcea4a5385942c342ff1d9c
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jan 2012 17:36:10 +0000 (9 09:36 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jan 2012 17:36:10 +0000 (9 09:36 -0800)
tree90358cbb033a126c4d48793a80fd804b7baaca24
parent59815c02506eb39b61e672528ed03885749ba529
parent7655cb66d86564e792b825f1a0e1a4de7d6e6db5
Merge from trunk.
88 files changed:
src/ChangeLog
src/alloc.c
src/bidi.c
src/buffer.c
src/buffer.h
src/bytecode.c
src/callint.c
src/callproc.c
src/casefiddle.c
src/casetab.c
src/category.c
src/ccl.c
src/character.c
src/charset.c
src/charset.h
src/cmds.c
src/coding.c
src/coding.h
src/composite.c
src/composite.h
src/data.c
src/dbusbind.c
src/dired.c
src/dispextern.h
src/dispnew.c
src/doc.c
src/doprnt.c
src/editfns.c
src/emacs.c
src/eval.c
src/fileio.c
src/floatfns.c
src/fns.c
src/font.c
src/font.h
src/fontset.c
src/frame.c
src/frame.h
src/fringe.c
src/ftfont.c
src/gnutls.c
src/gnutls.h
src/gtkutil.c
src/image.c
src/indent.c
src/indent.h
src/insdel.c
src/intervals.c
src/intervals.h
src/keyboard.c
src/keyboard.h
src/keymap.c
src/lisp.h
src/lread.c
src/macros.c
src/marker.c
src/menu.c
src/minibuf.c
src/nsfns.m
src/nsfont.m
src/nsmenu.m
src/nsselect.m
src/print.c
src/process.c
src/puresize.h
src/scroll.c
src/search.c
src/sound.c
src/syntax.c
src/syntax.h
src/sysdep.c
src/term.c
src/termhooks.h
src/textprop.c
src/undo.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/xml.c
src/xrdb.c
src/xselect.c
src/xterm.c
src/xterm.h