(make_lispy_event): When converting from pixel to glyph coordinates,

offset by WINDOW_LEFT_MARGIN; this is needed for left-side scrollbars.

(syms_of_keyboard): Initialize and staticpro
internal_last_event_frame and read_key_sequence_cmd.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index a145406e375..e55d1e06650 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3764,7 +3764,7 @@ make_lispy_event (event)
             else
               {
                 int pixcolumn, pixrow;
-                column -= XINT (XWINDOW (window)->left);
+                column -= WINDOW_LEFT_MARGIN (XWINDOW (window));
                 row -= XINT (XWINDOW (window)->top);
                 glyph_to_pixel_coords (f, column, row, &pixcolumn, &pixrow);
                 XSETINT (event->x, pixcolumn);
@@ -4027,7 +4027,7 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
       if (WINDOWP (window))
         {
           int pixcolumn, pixrow;
-          column -= XINT (XWINDOW (window)->left);
+          column -= WINDOW_LEFT_MARGIN (XWINDOW (window));
           row -= XINT (XWINDOW (window)->top);
           glyph_to_pixel_coords (frame, column, row, &pixcolumn, &pixrow);
           XSETINT (x, pixcolumn);