Merge master into gtk3.

diff --cc INSTALL
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/output/cairo.c
Simple merge

diff --cc src/output/cairo.h
Simple merge

diff --cc src/output/render.c
Simple merge

diff --cc src/ui/gui/automake.mk
Simple merge

diff --cc src/ui/gui/main.c
Simple merge

diff --cc src/ui/gui/page-assistant.c
Simple merge

diff --cc src/ui/gui/page-separators.c
Simple merge

diff --cc src/ui/gui/pspp-sheet-view.c
index 5bdeee4c56a44b02631f65d6254ea42d696df400,cd4999301f6539a13d95dc21d5c32e050108b503..ccdbd10e9919b5d61cbc059bd6d4c7284c66e277
--- 1/src/ui/gui/pspp-sheet-view.c
--- 2/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@@ -3844,12 -3773,18 +3841,18 @@@ pspp_sheet_view_draw_vertical_grid_line
  
        current_x += column->width;
  
 -      if (x >= event->area.x && x < event->area.x + event->area.width)
 -        gdk_draw_line (event->window,
 -                       tree_view->priv->grid_line_gc[GTK_WIDGET(tree_view)->state],
 -                       x, min_y,
 -                       x, max_y - min_y);
+       /* Generally the grid lines should fit within the column, but for the
+          last visible column we put it just past the end of the column.
+          (Otherwise horizontal grid lines sometimes stick out by one pixel.) */
+       x = current_x;
+       if (i != n_visible_columns - 1)
+         x--;
+ 
-       cairo_move_to (cr, current_x - 0.5, min_y);
-       cairo_line_to (cr, current_x - 0.5 , max_y - min_y);
-       
 +      cairo_set_line_width (cr, 1.0);
 +      cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
++      cairo_move_to (cr, x + 0.5, min_y);
++      cairo_line_to (cr, x + 0.5, max_y - min_y);
 +      cairo_stroke (cr);
      }
  }
  
@@@ -4241,40 -4161,19 +4244,40 @@@ pspp_sheet_view_bin_expose (GtkWidge
  
          if (draw_hgrid_lines)
            {
 -            if (background_area.y > 0)
 -              gdk_draw_line (event->window,
 -                             tree_view->priv->grid_line_gc[widget->state],
 -                             background_area.x, background_area.y,
 -                             background_area.x + background_area.width,
 -                             background_area.y);
 -
 -            if (y_offset + max_height <= event->area.height)
 -              gdk_draw_line (event->window,
 -                             tree_view->priv->grid_line_gc[widget->state],
 -                             background_area.x, background_area.y + max_height,
 -                             background_area.x + background_area.width,
 -                             background_area.y + max_height);
 +            cairo_set_line_width (cr, 1.0);
 +            cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
 +
 +            if (background_area.y >= 0)
 +              {
 +#if GTK3_TRANSITION
 +                gdk_draw_line (event->window,
 +                               tree_view->priv->grid_line_gc[widget->state],
 +                               background_area.x, background_area.y,
 +                               background_area.x + background_area.width,
 +                               background_area.y);
 +#else
 +                cairo_move_to (cr, background_area.x, background_area.y - 0.5);
 +                cairo_line_to (cr, background_area.x + background_area.width,
 +                               background_area.y - 0.5);
 +#endif
 +              }
 +
-             if (y_offset + max_height >= Zarea.height - 0.5)
++            if (y_offset + max_height <= Zarea.height - 0.5)
 +              {
 +#if GTK3_TRANSITION
 +                gdk_draw_line (event->window,
 +                               tree_view->priv->grid_line_gc[widget->state],
 +                               background_area.x, background_area.y + max_height,
 +                               background_area.x + background_area.width,
 +                               background_area.y + max_height);
 +#else
 +
 +                cairo_move_to (cr, background_area.x, background_area.y + max_height - 0.5);
 +                cairo_line_to (cr, background_area.x + background_area.width,
 +                               background_area.y + max_height - 0.5);
 +#endif
 +              }
 +            cairo_stroke (cr);
            }
  
            _pspp_sheet_view_column_cell_render (column,

diff --cc src/ui/gui/psppire-conf.c
Simple merge

diff --cc src/ui/gui/psppire-data-editor.c
Simple merge

diff --cc src/ui/gui/psppire-data-sheet.c
Simple merge

diff --cc src/ui/gui/psppire-data-window.c
Simple merge

diff --cc src/ui/gui/psppire-output-window.c
Simple merge

diff --cc src/ui/gui/syntax-editor.ui
Simple merge

diff --cc src/ui/gui/text-data-import-dialog.c
Simple merge