Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 18:19:35 +0000 (11:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 18:19:35 +0000 (11:19 -0700)
commite41e9a0e24877b0bc81e08df396f59115f8636da
treec0cf7e2838761b2c26047aeeac6415bb542bf5a0
parent6a54b501af0633c909c96de867c805222fde970c
parent529a133c390049085db38e7c8f745d650a2626ee
Merge from trunk.
src/ChangeLog
src/buffer.c
src/image.c
src/window.c
src/xfns.c