From b2cc0976a7e167f47d3f71fb637af699950f15f9 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 Mar 2012 10:53:06 +0000
Subject: * 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
---
 regerror.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'regerror.c')

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:
-- 
cgit v1.2.1