[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] fill_column_indicator 1eab6b3 10/10: Fixed fill-column-ind
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] fill_column_indicator 1eab6b3 10/10: Fixed fill-column-indicator face removing background. |
Date: |
Sun, 5 May 2019 10:29:15 -0400 (EDT) |
branch: fill_column_indicator
commit 1eab6b3f8110d7cd6ec66ea47336dbafe1d7613b
Author: Jimmy Aguilar Mena <address@hidden>
Commit: Jimmy Aguilar Mena <address@hidden>
Fixed fill-column-indicator face removing background.
*lisp/faces.el: Removed background in default fill-column-indicator
face.
*src/xdisp.c: fill-column-indicator face merged with saved face.
---
lisp/faces.el | 4 +++-
src/xdisp.c | 10 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lisp/faces.el b/lisp/faces.el
index b933279..207b627 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2502,7 +2502,9 @@ unwanted effects."
;; Definition stolen from display-line-numbers.
(defface fill-column-indicator
- '((t :inherit (shadow default)))
+ '((t :inherit shadow :weight normal :slant normal
+ :underline nil :overline nil :strike-through nil
+ :box nil :invert-video nil :stipple nil))
"Face for displaying fill column indicator.
This face is used when `display-fill-column-indicator-mode' is
non-nil."
diff --git a/src/xdisp.c b/src/xdisp.c
index 1782748..a8604d5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20201,7 +20201,7 @@ append_space_for_newline (struct it *it, bool
default_face_p)
XFIXNAT (Vdisplay_fill_column_indicator_character);
it->face_id =
merge_faces (it->w, Qfill_column_indicator,
- 0, DEFAULT_FACE_ID);
+ 0, saved_face_id);
face = FACE_FROM_ID(it->f, it->face_id);
goto produce_glyphs;
}
@@ -20494,7 +20494,7 @@ extend_face_to_end_of_line (struct it *it)
XFIXNAT (Vdisplay_fill_column_indicator_character);
it->face_id =
merge_faces (it->w, Qfill_column_indicator,
- 0, DEFAULT_FACE_ID);
+ 0, saved_face_id);
PRODUCE_GLYPHS (it);
}
@@ -20656,13 +20656,13 @@ extend_face_to_end_of_line (struct it *it)
{
if (it->current_x == fill_column_indicator_column)
{
- const int saved_face = it->face_id;
+ const int saved_face_id = it->face_id;
it->face_id =
- merge_faces (it->w, Qfill_column_indicator, 0,
DEFAULT_FACE_ID);
+ merge_faces (it->w, Qfill_column_indicator, 0,
saved_face_id);
it->c = it->char_to_display =
XFIXNAT (Vdisplay_fill_column_indicator_character);
PRODUCE_GLYPHS (it);
- it->face_id = saved_face;
+ it->face_id = saved_face_id;
it->c = it->char_to_display = ' ';
}
else
- [Emacs-diffs] branch fill_column_indicator created (now 1eab6b3), Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator ab4619e 02/10: Display-fill-column-indicator NEWS info., Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator 5b842bd 08/10: *src/xdisp.c: Fixed fill column indicator position in terminal mode., Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator 18ea760 06/10: ; Small changes in the documentation, Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator c34f00b 03/10: Fixed fill-column-indicator for continuation lines, Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator d8089ad 05/10: Added correction in the texinfo manual., Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator 1eab6b3 10/10: Fixed fill-column-indicator face removing background.,
Jimmy Aguilar Mena <=
- [Emacs-diffs] fill_column_indicator 245dff1 01/10: Start display-fill-column-indicator-mode., Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator 491e145 07/10: display-fill-column-indicator interface corrections, Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator c7ff15c 04/10: Added fill-column-indicator manual documentation, Jimmy Aguilar Mena, 2019/05/05
- [Emacs-diffs] fill_column_indicator a336300 09/10: ; Corrected display-fill-column-indicator mode., Jimmy Aguilar Mena, 2019/05/05