[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master cc47cd4 17/20: ; extend_face_id and fill_column_ind
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] master cc47cd4 17/20: ; extend_face_id and fill_column_indicator corrections |
Date: |
Mon, 14 Oct 2019 08:32:34 -0400 (EDT) |
branch: master
commit cc47cd4202aa474cf83d6fc42d959460d3cf823f
Author: Jimmy Aguilar Mena <address@hidden>
Commit: Jimmy Aguilar Mena <address@hidden>
; extend_face_id and fill_column_indicator corrections
*etc/NEWS: Correction for extend face and add some comments in the
code.
---
etc/NEWS | 7 ++++---
src/xdisp.c | 10 +++++++++-
src/xfaces.c | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 680ac03..5923726 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -385,10 +385,11 @@ simply, makes "foo" complete to both "barfoo" and
"frodo". Add 'flex'
to 'completion-styles' or 'completion-category-overrides' to use it.
+++
-** There is a new face attribute :extend to use the face attributes to
+** New face attribute ':extend' to control face extension at EOL.
+There is a new face attribute :extend to use the face attributes to
extend after the end of the line until the end of the window. Such
-:extend is set to nil by default in all faces except for `hl-line` and
-`region` because those extend until the end of the window by default.
+:extend is set to nil by default in all faces except for 'hl-line' and
+'region' because those extend until the end of the window by default.
** Connection-local variables
diff --git a/src/xdisp.c b/src/xdisp.c
index 45462c5..6c0b1f8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -442,7 +442,7 @@ fill_column_indicator_column (struct it *it, int char_width)
? BVAR (current_buffer, fill_column)
: Vdisplay_fill_column_indicator_column);
- /* The stretch width needs to considet the latter
+ /* The stretch width needs to consider the latter
added glyph in append_space_for_newline. */
if (RANGED_FIXNUMP (0, col, INT_MAX))
{
@@ -21691,6 +21691,9 @@ extend_face_to_end_of_line (struct it *it)
&& indicator_column < it->last_visible_x)
{
+ /* Here we substract char_width because we want the
+ column indicator in the column INDICATOR_COLUMN, not
+ after it. */
const int stretch_width =
indicator_column - it->current_x - char_width;
@@ -21851,6 +21854,11 @@ extend_face_to_end_of_line (struct it *it)
default_face->id : face->id);
/* Display fill-column indicator if needed. */
+ /* We need to subtract 1 to the indicator_column here because we
+ will add the indicator IN the column indicator number, not
+ after it. We compare the variable it->current_x before
+ producing the glyph. When FRAME_WINDOW_P we substract
+ CHAR_WIDTH calculating STRETCH_WIDTH for the same reason. */
const int indicator_column =
fill_column_indicator_column (it, 1) - 1;
do
diff --git a/src/xfaces.c b/src/xfaces.c
index cc65527..5a741ae 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2284,7 +2284,7 @@ filter_face_ref (Lisp_Object face_ref,
ATTR_FILTER is the index of a parameter that conditions the merging
for named faces (case 1) to only the face_ref where
- lface[merge_face_ref] is non-nil. To merge unconditionally set this
+ lface[merge_face_ref] is non-nil. To merge unconditionally set this
value to 0.
FACE_REF may be a single face specification or a list of such
- [Emacs-diffs] master acc7209 12/20: Extend_face simplify., (continued)
- [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, 2019/10/14
- [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 <=
- [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