master da274d73f9 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit da274d73f9e12d461eee1a750694df9d81ad94fe
Merge: 835ce688e2 76ffd4427d
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 src/nsterm.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index b7b7bc2ad3..ecaca5b87f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2337,8 +2337,8 @@ ns_mouse_position (struct frame **fp, int insist, 
Lisp_Object *bar_window,
                         belowWindowWithWindowNumber: window_number];
       w = [NSApp windowWithWindowNumber: window_number];
 
-      if (EQ (EQ (track_mouse, Qdrag_source)
-             || EQ (track_mouse, Qdropping))
+      if ((EQ (track_mouse, Qdrag_source)
+          || EQ (track_mouse, Qdropping))
          && w && [[w delegate] isKindOfClass: [EmacsTooltip class]])
        continue;