From: Eli Zaretskii Date: Sat, 24 Aug 2013 12:59:13 +0000 (+0300) Subject: Fix bug #15175 with cursor on boxed characters from display tables. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~133 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11f20add707674b98227ca6f26d0e7f10dbbfac9;p=emacs.git 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 2bb41071fd6..70d722a02a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2013-08-24 Eli Zaretskii + * 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 ca130473c0f..fecf22af1e9 100644 --- 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