From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 18 Oct 2019 14:55:21 +0000 (+0300)
Subject: Fix handling of mouse events on header line with tab-line
X-Git-Tag: emacs-27.0.90~1006
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fd1c086e7c6e182893e727444faa33de1c62650;p=emacs.git

Fix handling of mouse events on header line with tab-line

* src/window.c (coordinates_in_window): Fix conditions for
coordinates being on the window's header line when that
window also displays a tab-line.  (Bug#37807)
---

diff --git a/src/window.c b/src/window.c
index e4bb2daeb38..0fa0bdf7b92 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1321,8 +1321,10 @@ coordinates_in_window (register struct window *w, int x, int y)
 	       && y < top_y + CURRENT_TAB_LINE_HEIGHT (w)
 	       && (part = ON_TAB_LINE))
 	   || (window_wants_header_line (w)
-	       && y < top_y + CURRENT_TAB_LINE_HEIGHT (w)
-			    + CURRENT_HEADER_LINE_HEIGHT (w)
+	       && y < top_y + CURRENT_HEADER_LINE_HEIGHT (w)
+	       + (window_wants_tab_line (w)
+		  ? CURRENT_TAB_LINE_HEIGHT (w)
+		  : 0)
 	       && (part = ON_HEADER_LINE)))
     {
       /* If it's under/over the scroll bar portion of the mode/header