diff options
| author | Kenichi Handa | 2005-09-12 11:51:55 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2005-09-12 11:51:55 +0000 |
| commit | 5add1986c08021e0abcbbf3b4d9266c721c0988b (patch) | |
| tree | fcb22368f319cfb31ea6c77aefeefb76496f8d21 /src | |
| parent | fe8089a249e18384f280d44c72e6b779def49206 (diff) | |
| download | emacs-5add1986c08021e0abcbbf3b4d9266c721c0988b.tar.gz emacs-5add1986c08021e0abcbbf3b4d9266c721c0988b.zip | |
(display_mode_element): Be sure to make variables THIS
and LISP_STRING point into a string data of ELT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 633d594ed77..061e1d87701 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-09-12 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * xdisp.c (display_mode_element): Be sure to make variables THIS | ||
| 4 | and LISP_STRING point into a string data of ELT. | ||
| 5 | |||
| 1 | 2005-09-12 Kim F. Storm <storm@cua.dk> | 6 | 2005-09-12 Kim F. Storm <storm@cua.dk> |
| 2 | 7 | ||
| 3 | * editfns.c (Ftranslate_region_internal): Reload `tt' after | 8 | * editfns.c (Ftranslate_region_internal): Reload `tt' after |
diff --git a/src/xdisp.c b/src/xdisp.c index f06121a475c..a07e50aba89 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -16171,6 +16171,8 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky) | |||
| 16171 | else /* c == 0 */ | 16171 | else /* c == 0 */ |
| 16172 | break; | 16172 | break; |
| 16173 | } | 16173 | } |
| 16174 | this += SDATA (elt) - lisp_string; | ||
| 16175 | lisp_string = SDATA (elt); | ||
| 16174 | } | 16176 | } |
| 16175 | } | 16177 | } |
| 16176 | break; | 16178 | break; |