[Emacs-diffs] emacs-24 r117191: Make jump scroll work with Gtk+

[Jan D.]

------------------------------------------------------------
revno: 117191
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-06-01 20:00:56 +0200
message:
  Make jump scroll work with Gtk+
  
  * xterm.c (xg_scroll_callback): Remove position, for jump set portion
  to min(value, whole).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-01 07:06:28 +0000
+++ b/src/ChangeLog     2014-06-01 18:00:56 +0000
@@ -1,3 +1,8 @@
+2014-06-01  Jan Djärv  <address@hidden>
+
+       * xterm.c (xg_scroll_callback): Remove position, for jump set portion
+       to min(value, whole).
+
 2014-06-01  Paul Eggert  <address@hidden>
 
        Bring back the changes to GDB-visible symbols, but only on AIX.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-05-29 16:47:49 +0000
+++ b/src/xterm.c       2014-06-01 18:00:56 +0000
@@ -4441,14 +4441,11 @@
                     gpointer      user_data)
 {
   struct scroll_bar *bar = user_data;
-  gdouble position;
   int part = -1, whole = 0, portion = 0;
   GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (range));
   struct frame *f = g_object_get_data (G_OBJECT (range), XG_FRAME_DATA);
 
   if (xg_ignore_gtk_scrollbar) return FALSE;
-  position = gtk_adjustment_get_value (adj);
-
 
   switch (scroll)
     {
@@ -4460,7 +4457,7 @@
           part = scroll_bar_handle;
           whole = gtk_adjustment_get_upper (adj) -
             gtk_adjustment_get_page_size (adj);
-          portion = min ((int)position, whole);
+          portion = min ((int)value, whole);
           bar->dragging = portion;
         }
       break;