[cairo-commit] rcairo/src rb_cairo_font_options.c,1.2,1.3

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo/src
In directory kemper:/tmp/cvs-serv7585/src

Modified Files:
	rb_cairo_font_options.c 
Log Message:
* src/rb_cairo_font_options.c (Cairo::FontOptions#merge): renamed
  to merge! because the method is destructive.

* src/lib/cairo.rb (Cairo::FontOptions#merge): added
  non-destructive version.


Index: rb_cairo_font_options.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/rb_cairo_font_options.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rb_cairo_font_options.c	3 May 2007 02:47:39 -0000	1.2
+++ rb_cairo_font_options.c	26 May 2007 15:13:25 -0000	1.3
@@ -172,7 +172,8 @@
   rb_define_method (rb_cCairo_FontOptions, "initialize", cr_options_create, 0);
 
   rb_define_method (rb_cCairo_FontOptions, "dup", cr_options_copy, 0);
-  rb_define_method (rb_cCairo_FontOptions, "merge", cr_options_merge, 1);
+  rb_define_method (rb_cCairo_FontOptions, "merge!", cr_options_merge, 1);
+  rb_define_alias (rb_cCairo_FontOptions, "update", "merge!");
   rb_define_method (rb_cCairo_FontOptions, "eql?", cr_options_equal, 1);
   rb_define_method (rb_cCairo_FontOptions, "hash", cr_options_hash, 0);
   rb_define_method (rb_cCairo_FontOptions, "set_antialias",