Merge from trunk.
commit6e6c82a4e687708d5a7a3887f92db45bd74da276
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:58:48 +0000 (10 10:58 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:58:48 +0000 (10 10:58 -0800)
tree85dc3105240e84a8cddadb25d572e170fcdbd8bc
parent78df1fb1d46d556bfc2698ca1802972b13613ba8
parentcc26d239af9a82cff079556a1daff4b4bf60eb5c
Merge from trunk.
22 files changed:
src/ChangeLog
src/buffer.c
src/callproc.c
src/character.c
src/coding.c
src/dbusbind.c
src/dispnew.c
src/doc.c
src/eval.c
src/floatfns.c
src/fns.c
src/gnutls.c
src/image.c
src/keyboard.c
src/lread.c
src/minibuf.c
src/process.c
src/search.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xterm.c