[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 294a524 6/6: * src/xfaces.c (face_at_buffer_positio
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 294a524 6/6: * src/xfaces.c (face_at_buffer_position): Adapt lookup_basic_face call. |
Date: |
Sun, 4 Nov 2018 12:46:13 -0500 (EST) |
branch: master
commit 294a5246b264441d436612d4de0dd89fad130aa3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* src/xfaces.c (face_at_buffer_position): Adapt lookup_basic_face call.
---
src/xfaces.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xfaces.c b/src/xfaces.c
index 94397cd..76b23a3 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6099,7 +6099,7 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos,
cached faces since we've looked up the base face, we need
to look it up again. */
if (!FACE_FROM_ID_OR_NULL (f, face_id))
- face_id = lookup_basic_face (f, DEFAULT_FACE_ID);
+ face_id = lookup_basic_face (w, f, DEFAULT_FACE_ID);
}
else if (NILP (Vface_remapping_alist))
face_id = DEFAULT_FACE_ID;
- [Emacs-diffs] master updated (19d2ba0 -> 294a524), Glenn Morris, 2018/11/04
- [Emacs-diffs] master 4fbdcce 4/6: ; Merge from origin/emacs-26, Glenn Morris, 2018/11/04
- [Emacs-diffs] master 5ad0d80 2/6: ; Merge from origin/emacs-26, Glenn Morris, 2018/11/04
- [Emacs-diffs] master a914009 3/6: Merge from origin/emacs-26, Glenn Morris, 2018/11/04
- [Emacs-diffs] master 9b90f1b 1/6: Merge from origin/emacs-26, Glenn Morris, 2018/11/04
- [Emacs-diffs] master 294a524 6/6: * src/xfaces.c (face_at_buffer_position): Adapt lookup_basic_face call.,
Glenn Morris <=
- [Emacs-diffs] master 410e65e 5/6: Merge from origin/emacs-26, Glenn Morris, 2018/11/04