matz	2008-01-09 13:07:11 +0900 (Wed, 09 Jan 2008)

  New Revision: 14960

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/version.h

  Log:
    * string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange
      value if it's given from outside.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=14960&r2=14959&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14960&r2=14959&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14960&r2=14959&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14959)
+++ ChangeLog	(revision 14960)
@@ -1,3 +1,8 @@
+Wed Jan  9 13:03:34 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange
+	  value if it's given from outside.
+
 Wed Jan  9 08:42:01 2008  James Edward Gray II  <jeg2@r...>
 
 	* enum.c:  Updating the documentation of Enumrable#zip to reflect
Index: string.c
===================================================================
--- string.c	(revision 14959)
+++ string.c	(revision 14960)
@@ -1076,12 +1076,14 @@
             (ptr_a8 && str_cr != ENC_CODERANGE_7BIT)) {
             ptr_cr = ENC_CODERANGE_UNKNOWN;
         }
-        else {
+        else if (ptr_cr == ENC_CODERANGE_UNKNOWN) {
             ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex));
         }
     }
     else {
-        ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex));
+	if (ptr_cr == ENC_CODERANGE_UNKNOWN) {
+	    ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex));
+	}
         if (str_cr == ENC_CODERANGE_UNKNOWN) {
             if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) {
                 str_cr = rb_enc_str_coderange(str);
Index: version.h
===================================================================
--- version.h	(revision 14959)
+++ version.h	(revision 14960)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-01-08"
+#define RUBY_RELEASE_DATE "2008-01-09"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080108
+#define RUBY_RELEASE_CODE 20080109
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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