[Emacs-diffs] /srv/bzr/emacs/trunk r105447: Fix bug #9296 with vertical cursor motion on images.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105447
fixes bug(s): http://debbugs.gnu.org/9296
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-14 14:10:19 +0300
message:
  Fix bug #9296 with vertical cursor motion on images.
  
   src/xdisp.c (move_it_in_display_line_to): Don't invoke
   IT_RESET_X_ASCENT_DESCENT when iterator position was restored from
   ppos_it.  Fixes vertical cursor motion when line beginning is
   covered by an image.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-14 10:39:38 +0000
+++ b/src/ChangeLog     2011-08-14 11:10:19 +0000
@@ -1,3 +1,10 @@
+2011-08-14  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (move_it_in_display_line_to): Don't invoke
+       IT_RESET_X_ASCENT_DESCENT when iterator position was restored from
+       ppos_it.  Fixes vertical cursor motion when line beginning is
+       covered by an image.  (Bug#9296)
+
 2011-08-14  Jan Djärv  <address@hidden>
 
        * nsterm.h (ns_run_ascript): Declare.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-08-14 06:04:44 +0000
+++ b/src/xdisp.c       2011-08-14 11:10:19 +0000
@@ -8037,8 +8037,12 @@
              if (!saw_smaller_pos && IT_CHARPOS (*it) > to_charpos)
                {
                  if (IT_CHARPOS (ppos_it) < ZV)
-                   RESTORE_IT (it, &ppos_it, ppos_data);
-                 goto buffer_pos_reached;
+                   {
+                     RESTORE_IT (it, &ppos_it, ppos_data);
+                     result = MOVE_POS_MATCH_OR_ZV;
+                   }
+                 else
+                   goto buffer_pos_reached;
                }
              else if (it->line_wrap == WORD_WRAP && atpos_it.sp >= 0
                       && IT_CHARPOS (*it) > to_charpos)