]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix support of 'mouse-highlight' on NS (bug#78218)
authorGerd Möllmann <gerd.moellmann@gmail.com>
Sun, 4 May 2025 04:39:22 +0000 (06:39 +0200)
committerEshel Yaron <me@eshelyaron.com>
Sat, 10 May 2025 08:49:00 +0000 (10:49 +0200)
* src/nsterm.m: ([EmacsView keyDown:]): Add missing '!' in
if-condition.  Check tab_bar_window as other window systems do.

(cherry picked from commit 159e3a981ed5482393182b036e38818d42405c90)

src/nsterm.m

index 5514a693c86400996b54884fe6803c09c029ea17..f822481e2e28617e07120c7e18b36d3d5b12d2f9 100644 (file)
@@ -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)