usa	2012-02-06 16:25:37 +0900 (Mon, 06 Feb 2012)

  New Revision: 34435

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34435

  Log:
    merge revision(s) 33603:
    
    * file.c (file_expand_path): reset coderange after expanding path.
    
    [Backport #5601] [Backport #5629]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/file.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34434)
+++ ruby_1_9_3/ChangeLog	(revision 34435)
@@ -1,3 +1,7 @@
+Mon Feb  6 16:21:57 2012  NARUSE, Yui  <naruse@r...>
+
+	* file.c (file_expand_path): reset coderange after expanding path.
+
 Mon Feb  6 00:06:39 2012  NARUSE, Yui  <naruse@r...>
 
 	* ext/json/parser/parser.rl (json_string_unescape): workaround fix
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34434)
+++ ruby_1_9_3/version.h	(revision 34435)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 32
+#define RUBY_PATCHLEVEL 33
 
 #define RUBY_RELEASE_DATE "2012-02-06"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/file.c
===================================================================
--- ruby_1_9_3/file.c	(revision 34434)
+++ ruby_1_9_3/file.c	(revision 34435)
@@ -3176,6 +3176,7 @@
     if (tainted) OBJ_TAINT(result);
     rb_str_set_len(result, p - buf);
     rb_enc_check(fname, result);
+    ENC_CODERANGE_CLEAR(result);
     return result;
 }
 

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