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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2bb41071fd6934a3618f014b90c333b8ebed230f..70d722a02a4c69b3aaaae2349ae8ce0cbc5d5ce9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-24  Eli Zaretskii  <eliz@gnu.org>
 
+       * 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)

diff --git a/src/xdisp.c b/src/xdisp.c
index ca130473c0f3f489d967077feededfa1cd58b822..fecf22af1e903e2f91195d4003a0ca6b1290e962 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7050,7 +7050,7 @@ get_next_display_element (struct it *it)
                }
            }
        }
-      else
+      else if (it->method != GET_FROM_DISPLAY_VECTOR)
        {
          int face_id = face_after_it_pos (it);
          it->end_of_box_run_p