Merge from trunk.
commita89654f8f34114db543cb91363e8fded6d73e986
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 06:41:40 +0000 (24 22:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 06:41:40 +0000 (24 22:41 -0800)
tree5ac508597ef2aa460308b4b26c244779e48cdb40
parent6e6c82a4e687708d5a7a3887f92db45bd74da276
parent67b0de11479247cb8bd8491e10e0b464046f18be
Merge from trunk.
17 files changed:
src/ChangeLog
src/buffer.c
src/eval.c
src/fileio.c
src/gnutls.c
src/gtkutil.c
src/image.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/nsselect.m
src/syntax.c
src/window.c
src/xdisp.c
src/xfns.c
src/xselect.c
src/xterm.c