diff options
| author | Po Lu | 2021-12-09 10:30:18 +0800 |
|---|---|---|
| committer | Po Lu | 2021-12-09 10:30:18 +0800 |
| commit | 47cd820d93d282da484ae91e68021736ed7994bc (patch) | |
| tree | a24229d1df8547dfd427ef97cf9968b7f5a1e7a8 /src | |
| parent | 41b1d223c6ab7bca1b626a4c07a4f2dda2855feb (diff) | |
| parent | 63f07ea22f3954c2154d831017caf494911cb515 (diff) | |
| download | emacs-47cd820d93d282da484ae91e68021736ed7994bc.tar.gz emacs-47cd820d93d282da484ae91e68021736ed7994bc.zip | |
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 5c19b0cab82..5d39be3a870 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -6658,8 +6658,10 @@ not_in_argv (NSString *arg) | |||
| 6658 | ? ceil (fabs (delta)) : 1; | 6658 | ? ceil (fabs (delta)) : 1; |
| 6659 | 6659 | ||
| 6660 | scrollUp = delta > 0; | 6660 | scrollUp = delta > 0; |
| 6661 | x = [theEvent scrollingDeltaX]; | 6661 | x = ([theEvent scrollingDeltaX] |
| 6662 | y = [theEvent scrollingDeltaY]; | 6662 | * FRAME_COLUMN_WIDTH (emacsframe)); |
| 6663 | y = ([theEvent scrollingDeltaY] | ||
| 6664 | * FRAME_LINE_HEIGHT (emacsframe)); | ||
| 6663 | } | 6665 | } |
| 6664 | 6666 | ||
| 6665 | if (lines == 0 && mwheel_coalesce_scroll_events) | 6667 | if (lines == 0 && mwheel_coalesce_scroll_events) |