yugui	2010-01-30 21:47:08 +0900 (Sat, 30 Jan 2010)

  New Revision: 26483

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

  Log:
    merges r25318 from trunk into ruby_1_9_1.
    --
    * parse.y (parser_magic_comment): fixed normalization.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/parse.y
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26482)
+++ ruby_1_9_1/ChangeLog	(revision 26483)
@@ -1,3 +1,7 @@
+Tue Oct 13 18:20:57 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (parser_magic_comment): fixed normalization.
+
 Mon Oct 12 23:27:57 2009  Shugo Maeda  <shugo@r...>
 
 	* lib/net/ftp.rb (login): use "anonymous@" as a default password.
Index: ruby_1_9_1/parse.y
===================================================================
--- ruby_1_9_1/parse.y	(revision 26482)
+++ ruby_1_9_1/parse.y	(revision 26483)
@@ -6332,7 +6332,7 @@
 	str_copy(name, beg, n);
 	s = RSTRING_PTR(name);
 	for (i = 0; i < n; ++i) {
-	    if (*s == '-') *s = '_';
+	    if (s[i] == '-') s[i] = '_';
 	}
 #ifndef RIPPER
 	do {
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26482)
+++ ruby_1_9_1/version.h	(revision 26483)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 388
+#define RUBY_PATCHLEVEL 389
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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