diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:24 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:24 +0000 |
commit | e0bbc35ee6c3083c8cea36b32ed96eab57fb2f83 (patch) | |
tree | 6d64cea7493f08552d4fb0a487faebcf141197c5 /regerror.c | |
parent | b0722f60637313cc0dbc93533831128ad8266760 (diff) |
merges r20243 from trunk into ruby_1_9_1.
* re.c (rb_reg_desc): re might be NULL.
* regerror.c (onig_error_code_to_format): message updated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regerror.c')
-rw-r--r-- | regerror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regerror.c b/regerror.c index d5d1f4008e..780ba94a0e 100644 --- a/regerror.c +++ b/regerror.c @@ -51,7 +51,7 @@ onig_error_code_to_format(int code) case ONIG_NO_SUPPORT_CONFIG: p = "no support in this configuration"; break; case ONIGERR_MEMORY: - p = "fail to memory allocation"; break; + p = "failed to allocate memory"; break; case ONIGERR_MATCH_STACK_LIMIT_OVER: p = "match-stack limit over"; break; case ONIGERR_TYPE_BUG: |