merges the latter half of r24423 from trunk into ruby_1_9_1.

* encoding.c (enc_capable, rb_enc_get_index): Symbol is encoding
  capable.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c3d1d2170..96135b8cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  6 16:25:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_capable, rb_enc_get_index): Symbol is encoding
+	  capable.
+
 Wed Aug  5 19:11:01 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ruby.c (rb_stdio_set_default_encoding): declared.
diff --git a/encoding.c b/encoding.c
index 7d7324467..faebdfac8 100644
--- a/encoding.c
+++ b/encoding.c
@@ -539,7 +539,7 @@ rb_enc_find(const char *name)
 static inline int
 enc_capable(VALUE obj)
 {
-    if (SPECIAL_CONST_P(obj)) return Qfalse;
+    if (SPECIAL_CONST_P(obj)) return SYMBOL_P(obj);
     switch (BUILTIN_TYPE(obj)) {
       case T_STRING:
       case T_REGEXP:
@@ -565,6 +565,10 @@ rb_enc_get_index(VALUE obj)
     int i = -1;
     VALUE tmp;
 
+    if (SPECIAL_CONST_P(obj)) {
+	if (!SYMBOL_P(obj)) return -1;
+	obj = rb_id2str(SYM2ID(obj));
+    }
     switch (BUILTIN_TYPE(obj)) {
       as_default:
       default:
diff --git a/version.h b/version.h
index 1729b04c6..7d70338c6 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 277
+#define RUBY_PATCHLEVEL 278
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1