aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-08-24 15:59:13 +0300
committerEli Zaretskii2013-08-24 15:59:13 +0300
commit11f20add707674b98227ca6f26d0e7f10dbbfac9 (patch)
treec50ca09450a87e44427dcf6f0e5f65715ced2da5 /src
parentb34454d067efe26983f32ee6dc725d5122de58f4 (diff)
downloademacs-11f20add707674b98227ca6f26d0e7f10dbbfac9.tar.gz
emacs-11f20add707674b98227ca6f26d0e7f10dbbfac9.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
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 @@
12013-08-24 Eli Zaretskii <eliz@gnu.org> 12013-08-24 Eli Zaretskii <eliz@gnu.org>
2 2
3 * xdisp.c (get_next_display_element): Don't apply to characters
4 from a display vector the logic of setting it->end_of_box_run_p
5 suitable for characters from a buffer. (Bug#15175)
6
3 * w32.c (fdutimens): Call 'utime', which is implemented on w32.c 7 * w32.c (fdutimens): Call 'utime', which is implemented on w32.c
4 to handle directories, rather than '_utime' which doesn't. 8 to handle directories, rather than '_utime' which doesn't.
5 (Bug#15176) 9 (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)
7050 } 7050 }
7051 } 7051 }
7052 } 7052 }
7053 else 7053 else if (it->method != GET_FROM_DISPLAY_VECTOR)
7054 { 7054 {
7055 int face_id = face_after_it_pos (it); 7055 int face_id = face_after_it_pos (it);
7056 it->end_of_box_run_p 7056 it->end_of_box_run_p