Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-892

1 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cd6dd995bcf..6884af95810 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (handle_display_prop): Ignore display specs after
+        replacing one when string text is being replaced.
+        (handle_single_display_spec): Pretend as if characters with display
+        property haven't been consumed only when buffer text is being replaced.
+
 2007-10-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xfns.c (Fx_create_frame, Fx_display_list):
@@ -109,6 +116,11 @@
 
         * puresize.h (BASE_PURESIZE): Increase to 1170000.
 
+2007-10-09  Richard Stallman  <rms@gnu.org>
+
+        * xdisp.c (handle_invisible_prop): After setting up an ellipsis,
+        return HANDLED_RETURN.
+
 2007-10-08  Martin Rudalics  <rudalics@gmx.at>
 
         * keyboard.c (kbd_buffer_get_event): Break loop waiting for input