Fix build after merge

* lisp/mwheel.el (mouse-wheel-up-event):
* src/gtkutil.c (xg_event_is_for_scrollbar):
* src/termhooks.h (enum output_method): Fix trivial typos.

2 files changed, 1 insertions, 2 deletions

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0574d5691b1..c2b33912efb 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4793,7 +4793,6 @@ xg_event_is_for_scrollbar (struct frame *f, const EVENT *event)
                || event->type == GDK_MOTION_NOTIFY)
 #endif
            )
-               || event->type == MotionNotify))
 #endif /* HAVE_XINPUT2 */
     {
       /* If we are releasing or moving the scroll bar, it has the grab.  */
diff --git a/src/termhooks.h b/src/termhooks.h
index f0c3ffd57b1..649a4236d20 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -61,7 +61,7 @@ enum output_method
   output_msdos_raw,
   output_w32,
   output_ns,
-  output_pgtk
+  output_pgtk,
   output_haiku
 };