From: Po Lu <luangruo@yahoo.com>
Date: Sat, 17 Aug 2024 08:19:06 +0000 (+0800)
Subject: Backport ed305c4b98cda5c6d479310e4ba350a17d901e75 to emacs-30
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~549
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8d5f88d326b409651b0ebd6275b881d500090ea5;p=emacs.git

Backport ed305c4b98cda5c6d479310e4ba350a17d901e75 to emacs-30

* src/xterm.c (x_construct_mouse_click): `||' → `|'.
Typo found by clang 18.1.6 -Wbool-operation.  Do not
merge to master.
---

diff --git a/src/xterm.c b/src/xterm.c
index 215a3ed3bbe..fd3e58f85f6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14699,7 +14699,7 @@ x_construct_mouse_click (struct input_event *result,
           result->kind = (event->type != ButtonRelease ? NO_EVENT
 		          : wheel & 2 ? HORIZ_WHEEL_EVENT : WHEEL_EVENT);
           result->code = 0;         /* Not used.  */
-          result->modifiers &= ~(up_modifier || down_modifier);
+          result->modifiers &= ~(up_modifier | down_modifier);
           result->modifiers |= wheel & 1 ? up_modifier : down_modifier;
         }
     }