diff options
| author | Jimmy Aguilar Mena | 2019-10-13 23:20:22 +0200 |
|---|---|---|
| committer | Jimmy Aguilar Mena | 2019-10-14 14:18:42 +0200 |
| commit | 7a10082093791f0e035e4f9f95a774a7be1cd586 (patch) | |
| tree | 2474ec37d1a9e85cc95a72f9c6a0b86260c2be11 | |
| parent | 501846c85932f1c11405f0a1748b884074a76004 (diff) | |
| download | emacs-feature/extend_face_id.tar.gz emacs-feature/extend_face_id.zip | |
Fix issue calling face_at_pos.feature/extend_face_id
*src/xdisp.c (extend_face_to_end_of_line): Add extra condition when
producing glyphs from a C string to not call face_at_pos.
| -rw-r--r-- | src/xdisp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index d54b717a507..30be492d9b4 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -21578,7 +21578,8 @@ extend_face_to_end_of_line (struct it *it) | |||
| 21578 | || WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0)) | 21578 | || WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0)) |
| 21579 | return; | 21579 | return; |
| 21580 | 21580 | ||
| 21581 | const int extend_face_id = (it->face_id == DEFAULT_FACE_ID) | 21581 | const int extend_face_id = (it->face_id == DEFAULT_FACE_ID |
| 21582 | || it->s != NULL) | ||
| 21582 | ? DEFAULT_FACE_ID | 21583 | ? DEFAULT_FACE_ID |
| 21583 | : face_at_pos (it, LFACE_EXTEND_INDEX); | 21584 | : face_at_pos (it, LFACE_EXTEND_INDEX); |
| 21584 | 21585 | ||