From: Gerd Möllmann <gerd.moellmann@gmail.com>
Date: Sun, 4 May 2025 04:39:22 +0000 (+0200)
Subject: Fix support of 'mouse-highlight' on NS (bug#78218)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d080250594dc29af6fe536372d03e27c0aaa3ff2;p=emacs.git

Fix support of 'mouse-highlight' on NS (bug#78218)

* src/nsterm.m: ([EmacsView keyDown:]): Add missing '!' in
if-condition.  Check tab_bar_window as other window systems do.

(cherry picked from commit 159e3a981ed5482393182b036e38818d42405c90)
---

diff --git a/src/nsterm.m b/src/nsterm.m
index 5514a693c86..f822481e2e2 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6962,10 +6962,12 @@ ns_create_font_panel_buttons (id target, SEL select, SEL cancel_action)
 
   [NSCursor setHiddenUntilMouseMoves:! NILP (Vmake_pointer_invisible)];
 
-  if (hlinfo->mouse_face_hidden && FIXNUMP (Vmouse_highlight))
+  if (!hlinfo->mouse_face_hidden
+      && FIXNUMP (Vmouse_highlight)
+      && !EQ (emacsframe->tab_bar_window, hlinfo->mouse_face_window))
     {
       clear_mouse_face (hlinfo);
-      hlinfo->mouse_face_hidden = 1;
+      hlinfo->mouse_face_hidden = true;
     }
 
   if (!processingCompose)