From: Po Lu <luangruo@yahoo.com>
Date: Tue, 26 Jul 2022 02:29:16 +0000 (+0800)
Subject: Remove some redundant checks in the DND code
X-Git-Tag: emacs-29.0.90~1447^2~751
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06cec5ee0bd2c2a8fbc761bd5eb0254a4ecf10f4;p=emacs.git

Remove some redundant checks in the DND code

* src/xterm.c (handle_one_xevent): Don't check tab_bar_p or
tool_bar_p before clearing last items during drag-and-drop.
---

diff --git a/src/xterm.c b/src/xterm.c
index e953f54d6da..6f8291b494b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -19062,10 +19062,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
 		dpyinfo->grabbed |= (1 << event->xbutton.button);
 		dpyinfo->last_mouse_frame = f;
-		if (f && !tab_bar_p)
+
+		if (f)
 		  f->last_tab_bar_item = -1;
 #if ! defined (USE_GTK)
-		if (f && !tool_bar_p)
+		if (f)
 		  f->last_tool_bar_item = -1;
 #endif /* not USE_GTK */
 	      }
@@ -20479,10 +20480,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 			  if (device)
 			    device->grab |= (1 << xev->detail);
 
-			  if (f && !tab_bar_p)
+			  if (f)
 			    f->last_tab_bar_item = -1;
 #if ! defined (USE_GTK)
-			  if (f && !tool_bar_p)
+			  if (f)
 			    f->last_tool_bar_item = -1;
 #endif /* not USE_GTK */
 			}