[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2e22604 5/6: Revert "*** empty log message ***"
From: |
Po Lu |
Subject: |
master 2e22604 5/6: Revert "*** empty log message ***" |
Date: |
Wed, 10 Nov 2021 01:05:07 -0500 (EST) |
branch: master
commit 2e2260427e9a47d2f91655ae1147631e92a99713
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Revert "*** empty log message ***"
This reverts commit 68a2a3307d1703ac8abe4b54c8e1ef9dda677c12.
---
src/nsterm.m | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/nsterm.m b/src/nsterm.m
index ed0e7a2..3727f86 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3976,6 +3976,19 @@ ns_draw_glyph_string (struct glyph_string *s)
NSRect r[2];
int n;
char box_drawn_p = 0;
+
+ struct face *face = s->face;
+ if (s->hl == DRAW_MOUSE_FACE)
+ {
+ face
+ = FACE_FROM_ID_OR_NULL (s->f,
+ MOUSE_HL_INFO (s->f)->mouse_face_face_id);
+ if (!face)
+ face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
+ }
+
+ s->face = face;
+
struct font *font = s->face->font;
if (! font) font = FRAME_FONT (s->f);
- master updated (ff9cf99 -> e27ca55), Po Lu, 2021/11/10
- master b21f1ca 4/6: Revert "Add support for event processing via XInput 2", Po Lu, 2021/11/10
- master e27ca55 6/6: Revert "Fix mouse face in NS port", Po Lu, 2021/11/10
- master e9b954f 1/6: Revert "Support opening the toolkit menu bar on NS", Po Lu, 2021/11/10
- master da5de19 2/6: Revert "Revert "Fix erasing cursor on top of raised boxes in NS port"", Po Lu, 2021/11/10
- master 12beb77 3/6: Revert "Fix erasing cursor on top of raised boxes in NS port", Po Lu, 2021/11/10
- master 2e22604 5/6: Revert "*** empty log message ***",
Po Lu <=