From 98b7f4bdefcc684389bebbd855a02a8097f1bb45 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 5 Sep 2013 07:51:37 +0400 Subject: [PATCH] * frame.c (check_minibuf_window): Update 'frame' with frame pointer. * xterm.c (x_scroll_bar_handle_click) [!USE_TOOLKIT_SCROLL_BARS]: Don't pass C integer to XINT (tiny fix for 2013-09-03 change). --- src/ChangeLog | 6 ++++++ src/frame.c | 2 ++ src/xterm.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6eb5125d20c..4a1a168d34c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-09-05 Dmitry Antipov + + * frame.c (check_minibuf_window): Update 'frame' with frame pointer. + * xterm.c (x_scroll_bar_handle_click) [!USE_TOOLKIT_SCROLL_BARS]: + Don't pass C integer to XINT (tiny fix for 2013-09-03 change). + 2013-09-05 Stefan Monnier * cmds.c (Fself_insert_command): Don't pass a non-integer to XINT. diff --git a/src/frame.c b/src/frame.c index d11a6b8fee9..b4638ed53c8 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1133,6 +1133,8 @@ check_minibuf_window (Lisp_Object frame, int select) { struct frame *f = decode_live_frame (frame); + XSETFRAME (frame, f); + if (WINDOWP (minibuf_window) && EQ (f->minibuffer_window, minibuf_window)) { Lisp_Object frames, this, window = make_number (0); diff --git a/src/xterm.c b/src/xterm.c index c7bfbae9e46..2f3d5ca7a01 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -5473,7 +5473,7 @@ x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_e /* If the user has released the handle, set it to its final position. */ if (event->type == ButtonRelease && bar->dragging != -1) { - int new_start = y - XINT (bar->dragging); + int new_start = y - bar->dragging; int new_end = new_start + bar->end - bar->start; x_scroll_bar_set_handle (bar, new_start, new_end, 0); -- 2.39.2