merges r20227 from trunk into ruby_1_9_1.

ruby.c (set_internal_encoding_once): fix typo in error string

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

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a29412a34..be0b1c21f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 12 07:16:01 2008  David Flanagan  <david@think32>
+
+	* ruby.c (set_internal_encoding_once): fix typo in error string
+
 Wed Nov 12 03:30:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/intern.h (rb_{external,locale}_str_new_cstr): optimized
diff --git a/ruby.c b/ruby.c
index 8d8183021..012f34bd2 100644
--- a/ruby.c
+++ b/ruby.c
@@ -632,7 +632,7 @@ set_internal_encoding_once(struct cmdline_options *opt, const char *e, int elen)
     if (opt->intern.enc.name &&
 	rb_funcall(ename, rb_intern("casecmp"), 1, opt->intern.enc.name) != INT2FIX(0)) {
 	rb_raise(rb_eRuntimeError,
-		 "default_intenal already set to %s", RSTRING_PTR(opt->intern.enc.name));
+		 "default_internal already set to %s", RSTRING_PTR(opt->intern.enc.name));
     }
     opt->intern.enc.name = ename;
 }