# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1121250562 0
# Node ID 1bfadb2c1c4c97fc60a3b490915679efbcf51420
# Parent  d57ad48e79014853fd4f922fbe6d7686e57a8470
*** empty log message ***

diff -r d57ad48e7901 -r 1bfadb2c1c4c lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jul 13 10:15:39 2005 +0000
+++ b/lisp/ChangeLog	Wed Jul 13 10:29:22 2005 +0000
@@ -1,3 +1,9 @@
+2005-07-13  Kim F. Storm  <storm@cua.dk>
+
+	* simple.el (line-move-1): Always use vertical-motion to
+	do the last (or only) line move to ensure some movement.
+	Undo 2005-06-23 change--don't check for overlays.
+
 2005-07-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* term/mac-win.el (ccl-encode-mac-roman-font)
diff -r d57ad48e7901 -r 1bfadb2c1c4c src/ChangeLog
--- a/src/ChangeLog	Wed Jul 13 10:15:39 2005 +0000
+++ b/src/ChangeLog	Wed Jul 13 10:29:22 2005 +0000
@@ -1,5 +1,23 @@
 2005-07-13  Kim F. Storm  <storm@cua.dk>
 
+	* xdisp.c (start_display): Don't reseat to next visible line start
+	if current start position is in a string or image.
+	(move_it_vertically_backward): Be sure to move out of strings and
+	images when moving it2 forward.
+	(move_it_by_lines): When moving forward, move to next buffer
+	position if we end up in a string or image.  When moving backward,
+	count rows moved over when moving to start of current row in case
+	row starts in middle of a string or image.  Also move further
+	backward if we end up in a string or image.
+	(try_cursor_movement): if overlay string spans multiple lines,
+	move backward to set cursor on start of an overlay string.
+	(cursor_row_p): Row is ok if cursor is at newline from string, but
+	string starts on this line (so we always position cursor at start
+	of string).
+
+	* indent.c (Fvertical_motion): If start position is on an image,
+	don't move back if we move too far (that's almost certain to happen).
+
 	* xdisp.c (cursor_row_fully_visible_p): Allow partially visible
 	row in minibuffer windows.
 	(try_window): Don't check margins in minibuffer windows.