]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix mouse face in NS port
authoroldosfan <luangruo@yahoo.com>
Thu, 14 Oct 2021 03:05:00 +0000 (11:05 +0800)
committerPo Lu <luangruo@yahoo.com>
Wed, 10 Nov 2021 05:27:01 +0000 (13:27 +0800)
* src/nsterm.m (ns_draw_glyph_string): Set s->face to the mouse face.

src/nsterm.m

index ed0e7a2aae82a8b55dbef31028d4c7ccd1e8deb6..3727f861ac6b11f0b6df9628725b6a29d9beb5bf 100644 (file)
@@ -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);