merge revision(s) 28063:

	* encoding.c (rb_filesystem_encindex): avoid infinite require
	  loop. [ruby-core:30467]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/encoding.c b/encoding.c
index 001762221f..83607d5103 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1160,7 +1160,7 @@ rb_filesystem_encindex(void)
 {
     int idx = rb_enc_registered("filesystem");
     if (idx < 0)
-	idx = enc_set_filesystem_encoding();
+	idx = rb_ascii8bit_encindex();
     return idx;
 }