* parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed.

	* ext/nkf/nkf.c (rb_nkf_putchar): ditto.



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

1 files changed, 3 insertions, 3 deletions

diff --git a/parse.y b/parse.y
index 08a25df257..9cb3e18e83 100644
--- a/parse.y
+++ b/parse.y
@@ -4844,7 +4844,7 @@ parser_str_new(const char *p, long n, rb_encoding *enc, int func)
     if (!(func & STR_FUNC_REGEXP) &&
         rb_enc_asciicompat(enc) &&
         rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) {
-        rb_enc_associate(str, rb_default_encoding());
+        rb_enc_associate(str, rb_ascii_encoding());
     }
 
     return str;
@@ -8969,7 +8969,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
 	}
     }
     if (m - name < len) id = ID_JUNK;
-    if (enc != rb_default_encoding()) {
+    if (enc != rb_ascii_encoding()) {
 	/*
 	 * this clause makes sense only when called from other than
 	 * rb_intern_str() taking care of code-range.
@@ -8978,7 +8978,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
 	    for (; m <= name + len; ++m) {
 		if (!ISASCII(*m)) goto mbstr;
 	    }
-	    enc = rb_default_encoding();
+	    enc = rb_ascii_encoding();
 	}
       mbstr:;
     }