diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-06-18 12:14:26 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-06-18 12:14:26 -0700 |
| commit | 988b53ed2d3287f7ee9cfa4225765a97a245c133 (patch) | |
| tree | dca2fd0df6dea6b5400ea099facc1298ba1eba64 /src/nsterm.m | |
| parent | 2f477cbe7f7754c08e00b2b8bdceb2bc1a836db3 (diff) | |
| parent | ebe065fddf76fde64a9c07b419b67fe47fb6c1cb (diff) | |
| download | emacs-988b53ed2d3287f7ee9cfa4225765a97a245c133.tar.gz | |
Merge from origin/emacs-26
ebe065f Prevent errant scroll on mouse click (Bug#31546)
ffd2018 Minor documentation fix
cf4dc95 * lisp/window.el (window-toggle-side-windows): Doc fix. (Bug...
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index f0e6790e99e..a15684d3bf2 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2603,7 +2603,7 @@ ns_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, if (f && FRAME_NS_P (f)) { - view = FRAME_NS_VIEW (*fp); + view = FRAME_NS_VIEW (f); position = [[view window] mouseLocationOutsideOfEventStream]; position = [view convertPoint: position fromView: nil]; |