summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--lib/rexml/doctype.rb2
-rwxr-xr-xtest/json/test_json.rb1
-rwxr-xr-xtest/json/test_json_unicode.rb1
-rw-r--r--test/rss/test_maker_itunes.rb2
5 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b0f3355ac5..db4eda60b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jan 26 09:41:02 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/rexml/doctype.rb, test/rss/test_maker_itunes.rb: replace
+ multi-byte string.
+
+ * test/json/{test_json.rb, test_json_unicode.rb}:
+ add magic comment.
+
Sat Jan 26 09:30:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/encoding.h (rb_usascii_encindex): added prototype.
diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index e90c12d51a..35beabc566 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -188,7 +188,7 @@ module REXML
# Method contributed by Henrik Martensson
def strip_quotes(quoted_string)
- quoted_string =~ /^[\'\"].*[\´\"]$/ ?
+ quoted_string =~ /^[\'\"].*[\'\"]$/ ?
quoted_string[1, quoted_string.length-2] :
quoted_string
end
diff --git a/test/json/test_json.rb b/test/json/test_json.rb
index 2325c10063..257b8e0f63 100755
--- a/test/json/test_json.rb
+++ b/test/json/test_json.rb
@@ -1,4 +1,5 @@
#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
require 'test/unit'
require 'json'
diff --git a/test/json/test_json_unicode.rb b/test/json/test_json_unicode.rb
index 9e0d762f6d..cad93846b5 100755
--- a/test/json/test_json_unicode.rb
+++ b/test/json/test_json_unicode.rb
@@ -1,4 +1,5 @@
#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
require 'test/unit'
require 'json'
diff --git a/test/rss/test_maker_itunes.rb b/test/rss/test_maker_itunes.rb
index 1d4e323057..21a4dd1f29 100644
--- a/test/rss/test_maker_itunes.rb
+++ b/test/rss/test_maker_itunes.rb
@@ -462,7 +462,7 @@ module RSS
"all of your answers here.",
maker_readers, feed_readers)
_assert_maker_itunes_summary("This week we talk about surviving in a " +
- "Red state if you’re a Blue person. Or " +
+ "Red state if you're a Blue person. Or " +
"vice versa.",
maker_readers, feed_readers)
end