merge from trunk

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2bb41071fd6..70d722a02a4 100644
--- 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 551774ae2fd..67d386a93e2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7090,7 +7090,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