[Emacs-diffs] master updated (7ac84a2 -> c03c730)

[Jan D.]

jhd pushed a change to branch master.

      from  7ac84a2   * lisp/emacs-lisp/package.el: Always update 
selected-packages
      adds  dddcc0e   Add cairo drawing.
      adds  335ab26   Fix fringe bitmap initialization for cairo.
      adds  022d7cd   * xterm.c (x_draw_window_divider): Use x_fill_rectangle 
instead of XFillRectangle.
      adds  426af0e   Implement wave-style variant of underlining for cairo.
      adds  a7930e1   Modernize k&r cairo-related function declarations.
      adds  9045c43   Use int instead of unsigned int for width and height args.
      adds  49dd994   * xterm.c (x_draw_stretch_glyph_string): Call 
x_reset_clip_rectangles instead of XSetClipMask.
      adds  6bff750   * xterm.c (x_draw_relief_rect) [USE_CAIRO]: Reset 
clipping.
      adds  016b9ec   * xterm.c (x_fill_trapezoid_for_relief): Remove 
unnecessary cairo_close_path.
      adds  47bca72   Draw outermost line using black relief and erase corners 
also for cairo.
      adds  3be1a7c   * ftcrfont.c (ftcrfont_draw): Don't flush when drawing to 
screen.
      adds  7349006   Add CAIRO_CFLAGS to lwlib/Makefile.in
      adds  75c8741   Merge branch 'master' into cairo
      adds  fb77948   Merge branch 'master' into cairo, fixes tooltips not 
shown.
      adds  5558a14   Tool tips for menus did not show any text.
      adds  74c4ce2   Introduce limited Xpm support (32 bit ZPixmap) for Cairo.
      adds  69a8655   Support RSVG and cairo.
      adds  be008ff   Support JPEG with USE_CAIRO.
      adds  ac00e0a   Support GIF and Tiff with cairo.
      adds  c744c8a   Handle specified bg in images.  Use generic libpng code 
for PNG:s.
      adds  a3f1b3d   x_free_cr_resources: Renamed from x_prepare_for_xlibdraw.
      adds  5a09411   Add PBM support for cairo.
      adds  f92ac2e   Merge branch 'master' into cairo
      adds  6445ee0   Merge branch 'master' into cairo
      adds  ee14727   Fixes to compile cairo branch without cairo.
       new  6aaa489   Merge branch 'master' into cairo
       new  c03c730   Merge branch 'cairo'.


Summary of changes:
 ChangeLog.1       |   21 ++
 configure.ac      |   30 ++-
 lisp/ChangeLog.17 |    6 +
 lisp/version.el   |    7 +-
 lwlib/ChangeLog.1 |    3 +
 lwlib/Makefile.in |    2 +
 src/ChangeLog.13  |  236 +++++++++++++
 src/Makefile.in   |    8 +-
 src/dispextern.h  |    7 +
 src/font.c        |    4 +
 src/font.h        |    4 +
 src/fringe.c      |   24 ++-
 src/ftcrfont.c    |  320 +++++++++++++++++
 src/ftfont.c      |   26 ++-
 src/ftfont.h      |    5 +
 src/gtkutil.c     |  128 +++++++-
 src/gtkutil.h     |    6 +
 src/image.c       |  379 +++++++++++++++++++--
 src/xfns.c        |  193 +++++++++++
 src/xterm.c       |  998 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 src/xterm.h       |   53 +++-
 21 files changed, 2320 insertions(+), 140 deletions(-)
 create mode 100644 src/ftcrfont.c