*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fceccba7d43c8a37020cab1710e0363cc2bb2f9..164d7e3c29d861f557695e497dbcf2ae3994910e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-21  Kim F. Storm  <storm@cua.dk>
+
+       * simple.el (line-move-1): Check for move-end-of-line instead of
+       end-of-line when setting temporary-goal-column.
+
 2006-06-21  Miles Bader  <miles@gnu.org>
 
        * play/cookie1.el (cookie): Work properly when there's only one entry.

diff --git a/src/ChangeLog b/src/ChangeLog
index 05488eb9ce4aee3b6c26c49da987f26e4ed8d403..bf682a5ffdc267cd0df61e5b94b781954dee036b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-21  Kim F. Storm  <storm@cua.dk>
+
+       * dispextern.h (struct it): Add `position' member to iterator stack.
+       Rename `pos' member to `current'.  Rearrange and add comments.
+
+       * xdisp.c (handle_stop): Set it->ignore_overlay_strings_at_pos_p
+       if  we get any overlays.
+       (set_cursor_from_row): Don't clobber `end' if we rescan from
+       start_string.
+       (push_it, pop_it): Save it->position.
+
 2006-06-19  Richard Stallman  <rms@gnu.org>
 
        * window.c (size_window): New arg FIRST_ONLY.  All callers changed.