[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/pgtk 66b5f5a 3/3: Fix build after merge
From: |
Po Lu |
Subject: |
feature/pgtk 66b5f5a 3/3: Fix build after merge |
Date: |
Mon, 29 Nov 2021 19:35:29 -0500 (EST) |
branch: feature/pgtk
commit 66b5f5a87263030dd4a8d13080dea68afdb6c3e4
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
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.
---
lisp/mwheel.el | 2 +-
src/gtkutil.c | 1 -
src/termhooks.h | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index d04139d..3458fb6 100644
--- 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 0574d56..c2b3391 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 f0c3ffd..649a423 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
};