akr	2007-12-27 15:12:19 +0900 (Thu, 27 Dec 2007)

  New Revision: 14731

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_check): show encodings in error message.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14731&r2=14730
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14731&r2=14730

Index: encoding.c
===================================================================
--- encoding.c	(revision 14730)
+++ encoding.c	(revision 14731)
@@ -504,7 +504,9 @@
 {
     rb_encoding *enc = rb_enc_compatible(str1, str2);
     if (!enc)
-	rb_raise(rb_eArgError, "character encodings differ");
+	rb_raise(rb_eArgError, "character encodings differ: %s and %s",
+            rb_enc_name(rb_enc_get(str1)),
+            rb_enc_name(rb_enc_get(str2)));
     return enc;
 }
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14730)
+++ ChangeLog	(revision 14731)
@@ -1,3 +1,7 @@
+Thu Dec 27 15:11:27 2007  Tanaka Akira  <akr@f...>
+
+	* encoding.c (rb_enc_check): show encodings in error message.
+
 Thu Dec 27 15:02:52 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_casecmp): fixed using a wrong variable.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml