Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 26 Apr 2011 06:17:52 +0000 (23:17 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 26 Apr 2011 06:17:52 +0000 (23:17 -0700)
commit671875dac181f7f1337f21d013a9c3d5f235ddf2
tree4091c2537439713df8efe8d3376116a6db3eb1c5
parentf904488ff40dcee3e340b63a6386dde124d1241c
parent0c6b7b19e52ba18b5d4fd2d4b73b133a0a721603
Merge from mainline.
19 files changed:
ChangeLog
Makefile.in
configure.in
src/ChangeLog
src/buffer.c
src/callint.c
src/character.c
src/charset.c
src/coding.c
src/doc.c
src/font.c
src/gnutls.c
src/lisp.h
src/process.c
src/syntax.c
src/sysdep.c
src/textprop.c
src/xdisp.c
src/xfaces.c