[Emacs-diffs] trunk r114140: * frame.c (check_minibuf_window): Update 'frame' with frame pointer.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114140
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-09-05 07:51:37 +0400
message:
  * 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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-05 02:27:13 +0000
+++ b/src/ChangeLog     2013-09-05 03:51:37 +0000
@@ -1,3 +1,9 @@
+2013-09-05  Dmitry Antipov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * cmds.c (Fself_insert_command): Don't pass a non-integer to XINT.

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-02 17:23:26 +0000
+++ b/src/frame.c       2013-09-05 03:51:37 +0000
@@ -1133,6 +1133,8 @@
 {
   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);

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-09-04 04:02:56 +0000
+++ b/src/xterm.c       2013-09-05 03:51:37 +0000
@@ -5473,7 +5473,7 @@
     /* 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);