1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

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.
This commit is contained in:
Po Lu 2021-11-30 08:33:24 +08:00
parent 194c299470
commit 66b5f5a872
3 changed files with 2 additions and 3 deletions

View File

@ -77,7 +77,7 @@
(defcustom mouse-wheel-up-event (defcustom mouse-wheel-up-event
(if (or (featurep 'w32-win) (featurep 'ns-win) (if (or (featurep 'w32-win) (featurep 'ns-win)
(featurep 'haiku-win) (feautrep 'pgtk-win)) (featurep 'haiku-win) (featurep 'pgtk-win))
'wheel-down 'wheel-down
'mouse-5) 'mouse-5)
"Event used for scrolling up." "Event used for scrolling up."

View File

@ -4793,7 +4793,6 @@ xg_event_is_for_scrollbar (struct frame *f, const EVENT *event)
|| event->type == GDK_MOTION_NOTIFY) || event->type == GDK_MOTION_NOTIFY)
#endif #endif
) )
|| event->type == MotionNotify))
#endif /* HAVE_XINPUT2 */ #endif /* HAVE_XINPUT2 */
{ {
/* If we are releasing or moving the scroll bar, it has the grab. */ /* If we are releasing or moving the scroll bar, it has the grab. */

View File

@ -61,7 +61,7 @@ enum output_method
output_msdos_raw, output_msdos_raw,
output_w32, output_w32,
output_ns, output_ns,
output_pgtk output_pgtk,
output_haiku output_haiku
}; };