[Emacs-diffs] trunk r113990: Fix bug #15175 with cursor on boxed characters from display tables.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113990
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15175
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-08-24 15:59:13 +0300
message:
  Fix bug #15175 with cursor on boxed characters from display tables.
  
   src/xdisp.c (get_next_display_element): Don't apply to characters
   from a display vector the logic of setting it->end_of_box_run_p
   suitable for characters from a buffer.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-24 10:15:01 +0000
+++ b/src/ChangeLog     2013-08-24 12:59:13 +0000
@@ -1,5 +1,9 @@
 2013-08-24  Eli Zaretskii  <address@hidden>
 
+       * xdisp.c (get_next_display_element): Don't apply to characters
+       from a display vector the logic of setting it->end_of_box_run_p
+       suitable for characters from a buffer.  (Bug#15175)
+
        * w32.c (fdutimens): Call 'utime', which is implemented on w32.c
        to handle directories, rather than '_utime' which doesn't.
        (Bug#15176)

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-08-23 14:25:39 +0000
+++ b/src/xdisp.c       2013-08-24 12:59:13 +0000
@@ -7050,7 +7050,7 @@
                }
            }
        }
-      else
+      else if (it->method != GET_FROM_DISPLAY_VECTOR)
        {
          int face_id = face_after_it_pos (it);
          it->end_of_box_run_p