Merge branch 'master' into cairo

diff --cc configure.ac
Simple merge

diff --cc lwlib/Makefile.in
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/gtkutil.c
index d7340ba797e992edefb9faafcbce35078f3920f8,61bc5ee245a5798581dc9ae962582f37076722cb..5d28b0221af57b7bbe94de24f8aac910a28dab11
--- 1/src/gtkutil.c
--- 2/src/gtkutil.c
+++ b/src/gtkutil.c
@@@ -3795,16 -3806,18 +3813,20 @@@ xg_update_scrollbar_pos (struct frame *
            gtk_widget_show_all (wparent);
            gtk_widget_set_size_request (wscroll, width, height);
          }
 +#ifndef USE_CAIRO
        gtk_widget_queue_draw (wfixed);
        gdk_window_process_all_updates ();
 +#endif
        if (oldx != -1 && oldw > 0 && oldh > 0)
-       /* Clear under old scroll bar position.  This must be done after
-          the gtk_widget_queue_draw and gdk_window_process_all_updates
-          above.  */
-       x_clear_area (f,
-                     oldx, oldy, oldw, oldh);
+         {
+           /* Clear under old scroll bar position.  This must be done after
+              the gtk_widget_queue_draw and gdk_window_process_all_updates
+              above.  */
+         oldw += (scale - 1) * oldw;
+         oldx -= (scale - 1) * oldw;
+           x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                         oldx, oldy, oldw, oldh);
+         }
  
        /* GTK does not redraw until the main loop is entered again, but
           if there are no X events pending we will not enter it.  So we sync

diff --cc src/image.c
Simple merge

diff --cc src/xterm.c
Simple merge