From: Po Lu <luangruo@yahoo.com>
Date: Thu, 2 Dec 2021 09:53:58 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/pgtk
X-Git-Tag: emacs-29.0.90~3629
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f6b519eaeb3be4ee6a912b40a21686be12d4d88;p=emacs.git

Merge remote-tracking branch 'origin/master' into feature/pgtk
---

2f6b519eaeb3be4ee6a912b40a21686be12d4d88
diff --cc src/termhooks.h
index 649a4236d20,f64c19e0397..b124e995292
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@@ -269,10 -268,12 +269,17 @@@ enum event_kin
    , FILE_NOTIFY_EVENT
  #endif
  
 +#ifdef HAVE_PGTK
 +  /* Pre-edit text was changed. */
 +  , PGTK_PREEDIT_TEXT_EVENT
 +#endif
++
+   /* Either the mouse wheel has been released without it being
+      clicked, or the user has lifted his finger from a touchpad.
+ 
+      In the future, this may take into account other multi-touch
+      events generated from touchscreens and such.  */
+   , TOUCH_END_EVENT
  };
  
  /* Bit width of an enum event_kind tag at the start of structs and unions.  */