[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7a10082 19/20: Fix issue calling face_at_pos.
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] master 7a10082 19/20: Fix issue calling face_at_pos. |
Date: |
Mon, 14 Oct 2019 08:32:34 -0400 (EDT) |
branch: master
commit 7a10082093791f0e035e4f9f95a774a7be1cd586
Author: Jimmy Aguilar Mena <address@hidden>
Commit: Jimmy Aguilar Mena <address@hidden>
Fix issue calling face_at_pos.
*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.
---
src/xdisp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index d54b717..30be492 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21578,7 +21578,8 @@ extend_face_to_end_of_line (struct it *it)
|| WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0))
return;
- const int extend_face_id = (it->face_id == DEFAULT_FACE_ID)
+ const int extend_face_id = (it->face_id == DEFAULT_FACE_ID
+ || it->s != NULL)
? DEFAULT_FACE_ID
: face_at_pos (it, LFACE_EXTEND_INDEX);
- [Emacs-diffs] master eb25947 07/20: Changed handle_face_prop_general prototype., (continued)
- [Emacs-diffs] master eb25947 07/20: Changed handle_face_prop_general prototype., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 2b80b4d 11/20: Added parameter attr_filter to face_at_string_position., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master acc7209 12/20: Extend_face simplify., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master e02fe26 03/20: New parameter to control the face extension.., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 92445de 13/20: Optimization in extend_face, Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 42bbfd2 04/20: Update dfci code with new extend_face code., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 424e6f5 15/20: Document new :extend face attribute in manuals., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 0cf11eb 16/20: *etc/NEWS: Added comment about :extend face attribute in NEWS., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master faa9b06 05/20: Call handle_face_prop_general to extend face., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master e1b5e80 10/20: Extend face hl-line after end-of-line, Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 7a10082 19/20: Fix issue calling face_at_pos.,
Jimmy Aguilar Mena <=
- [Emacs-diffs] master bc8db39 02/20: Added face parameter :extend., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master cc47cd4 17/20: ; extend_face_id and fill_column_indicator corrections, Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 95d1c3b 08/20: Add space for cursor to work also in terminal., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 501846c 18/20: Modify face_at_pos to not modify change IT., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 38ee12d 14/20: Fixed merge_face_ref recursive calls., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master ab22720 09/20: Fix last change in append_space_for_newline., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 3d6075e 20/20: Merge branch 'feature/extend_face_id', Jimmy Aguilar Mena, 2019/10/14