aboutsummaryrefslogtreecommitdiffstats
path: root/regerror.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-21 10:53:06 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-21 10:53:06 +0000
commitb2cc0976a7e167f47d3f71fb637af699950f15f9 (patch)
tree82ec93041977a89596469e2b081256e86138a34c /regerror.c
parent51f41bb843845dee4b9ada16a8100a3f558d70cd (diff)
downloadruby-b2cc0976a7e167f47d3f71fb637af699950f15f9.tar.gz
* regcomp.c: Merge Onigmo 3d855b30d574536d3ae600260208c6624ae4791c.
[Bug#6143] [Bug#6144] [Bug#6145] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regerror.c')
-rw-r--r--regerror.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/regerror.c b/regerror.c
index 2bf1d320d3..9c94d23018 100644
--- a/regerror.c
+++ b/regerror.c
@@ -116,7 +116,7 @@ onig_error_code_to_format(OnigPosition code)
case ONIGERR_INVALID_REPEAT_RANGE_PATTERN:
p = "invalid repeat range {lower,upper}"; break;
case ONIGERR_INVALID_CONDITION_PATTERN:
- p = "invalid condition pattern"; break;
+ p = "invalid conditional pattern"; break;
case ONIGERR_TOO_BIG_NUMBER:
p = "too big number"; break;
case ONIGERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE: