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.

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index d04139d1489fdae29078adaa70709c037e342587..3458fb6d8488c6f8b4fa92588d860f3aa0f7d103 100644 (file)
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -77,7 +77,7 @@
 
 (defcustom mouse-wheel-up-event
   (if (or (featurep 'w32-win) (featurep 'ns-win)
-          (featurep 'haiku-win) (feautrep 'pgtk-win))
+          (featurep 'haiku-win) (featurep 'pgtk-win))
       'wheel-down
     'mouse-5)
   "Event used for scrolling up."

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 0574d5691b129ed9eeb02d7f8c79e626f6a1f053..c2b33912efb66635d9fcd61965a2fee66104ed47 100644 (file)
--- 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 f0c3ffd57b14d08d789057721fd87370104b6e91..649a4236d208402cff001c57a2814183c2257d20 100644 (file)
--- 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
 };