* 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).

diff --git a/src/ChangeLog b/src/ChangeLog
index 6eb5125d20c3056bf3722c19cfe61019a163325b..4a1a168d34cb6e75c7732f3b7a9694dac07339c4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * 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  <monnier@iro.umontreal.ca>
 
        * cmds.c (Fself_insert_command): Don't pass a non-integer to XINT.

diff --git a/src/frame.c b/src/frame.c
index d11a6b8fee9fdcb30d9450a5ef03132609e3d6fb..b4638ed53c8cabfa085badf76ef6ca419ce17cf1 100644 (file)
--- 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 c7bfbae9e4637b41476ff289d3ec09921bfcb206..2f3d5ca7a017fa697ad11bf61376f515cfc82c7e 100644 (file)
--- 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);