From: Kim F. Storm <storm@cua.dk>
Date: Wed, 21 Jun 2006 12:01:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~1888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43a37241f699b997eaf399d5a423462f6ac434fc;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fceccba7d4..164d7e3c29d 100644
--- 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 05488eb9ce4..bf682a5ffdc 100644
--- 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.