Merge from emacs-24; up to 2012-11-19T11:36:02Z!yamaoka@jpl.org

4 files changed, 24 insertions, 3 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index fa580cc99bf..e1ee81e66b5 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -495,7 +495,8 @@ define pgx
   end
   xgettype ($g.object)
   if ($type == Lisp_String)
-    printf " str=%x[%d]", $g.object, $g.charpos
+    xgetptr $g.object
+    printf " str=0x%x[%d]", ((struct Lisp_String *)$ptr)->data, $g.charpos
   else
     printf " pos=%d", $g.charpos
   end
diff --git a/src/ChangeLog b/src/ChangeLog
index e5669da5196..32a14ef9e62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2012-11-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Skip step 2 only if point is not
+        between bpos_covered and bpos_max.  This fixes cursor display when
+        several display strings follow each other.
+
+        * .gdbinit (pgx): If the glyph's object is a string, display the
+        pointer to string data, rather than the value of the string object
+        itself (which barfs under CHECK_LISP_OBJECT_TYPE).
+
+        * indent.c (Fvertical_motion): If the starting position is covered
+        by a display string, return to one position before that, to avoid
+        overshooting it inside move_it_to.  (Bug#12930)
+
 2012-11-23  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * frame.h (struct frame): Remove display_preempted member
diff --git a/src/indent.c b/src/indent.c
index eee96061e25..a3abf88feeb 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2048,7 +2048,13 @@ whether or not it is currently displayed in some window.  */)
            comment said this is "so we don't move too far" (2005-01-19
            checkin by kfs).  But this does nothing useful that I can
            tell, and it causes Bug#2694 .  -- cyd */
-        move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
+        /* When the position we started from is covered by a display
+           string, move_it_to will overshoot it, while vertical-motion
+           wants to put the cursor _before_ the display string.  So in
+           that case, we move to buffer position before the display
+           string, and avoid overshooting.  */
+        move_it_to (&it, disp_string_at_start_p ? PT - 1 : PT,
+                    -1, -1, -1, MOVE_TO_POS);
 
       /* IT may move too far if truncate-lines is on and PT lies
          beyond the right margin.  IT may also move too far if the
diff --git a/src/xdisp.c b/src/xdisp.c
index 5d260d851ef..2390475ca77 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14233,7 +14233,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
      GLYPH_BEFORE and GLYPH_AFTER.  */
   if (!((row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
         && BUFFERP (glyph->object) && glyph->charpos == pt_old)
-      && bpos_covered < pt_old)
+      && !(bpos_max < pt_old && pt_old <= bpos_covered))
     {
       /* An empty line has a single glyph whose OBJECT is zero and
          whose CHARPOS is the position of a newline on that line.