aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-12-12 20:07:42 +0200
committerEli Zaretskii2019-12-12 20:07:42 +0200
commitd7efe98951730842db4fc136e3b631c5ee0d8a53 (patch)
tree655f7a0086a876f9cf57caf3a18d6416db9c0548 /src
parentede63fed1f08bb3af6b22dc4b8a47154b18ffc4b (diff)
downloademacs-d7efe98951730842db4fc136e3b631c5ee0d8a53.tar.gz
emacs-d7efe98951730842db4fc136e3b631c5ee0d8a53.zip
; * src/xdisp.c (face_at_pos): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index f3aba4a5980..bb370bbb78f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4180,7 +4180,7 @@ face_at_pos (const struct it *it, enum lface_attribute_index attr_filter)
4180 } 4180 }
4181 else 4181 else
4182 { 4182 {
4183 int base_face_id = 0; 4183 int base_face_id;
4184 ptrdiff_t bufpos; 4184 ptrdiff_t bufpos;
4185 int i; 4185 int i;
4186 Lisp_Object from_overlay 4186 Lisp_Object from_overlay
@@ -4244,6 +4244,7 @@ face_at_pos (const struct it *it, enum lface_attribute_index attr_filter)
4244 but Emacs always did that since v21.1, so changing that 4244 but Emacs always did that since v21.1, so changing that
4245 might be a big deal. */ 4245 might be a big deal. */
4246 bool use_default = (it->string_from_prefix_prop_p != 0); 4246 bool use_default = (it->string_from_prefix_prop_p != 0);
4247 base_face_id = DEFAULT_FACE_ID;
4247 if (!use_default) 4248 if (!use_default)
4248 { 4249 {
4249 base_face_id = underlying_face_id (it); 4250 base_face_id = underlying_face_id (it);