From f69c1f18ee4d5ddd0aa5e865360f8b14c34e37de Mon Sep 17 00:00:00 2001
From: kosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 23 Mar 2006 12:08:08 +0000
Subject: merge Oniguruma 4.0.2

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 regerror.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'regerror.c')

diff --git a/regerror.c b/regerror.c
index 043f52d43b..f9b35dcb99 100644
--- a/regerror.c
+++ b/regerror.c
@@ -2,7 +2,7 @@
   regerror.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2005  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2006  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -170,6 +170,8 @@ onig_error_code_to_format(int code)
     p = "invalid character property name {%n}"; break;
   case ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION:
     p = "not supported encoding combination"; break;
+  case ONIGERR_INVALID_COMBINATION_OF_OPTIONS:
+    p = "invalid combination of options"; break;
   case ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT:
     p = "over thread pass limit count"; break;
 
-- 
cgit v1.2.3