diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:16 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:16 +0000 |
commit | 509a936e10588f2a205eb6c26ef56163f8720df3 (patch) | |
tree | 47ee6002c585a3e30490a2e5d69c24107729f38c | |
parent | 5f2d8e4ecaba40497b7bc97fda312f84774a3f6d (diff) |
merges r20227 from trunk into ruby_1_9_1.
ruby.c (set_internal_encoding_once): fix typo in error string
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ruby.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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 @@ -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; } |