diff options
| author | kosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-03-23 12:08:08 +0000 |
|---|---|---|
| committer | kosako <kosako@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-03-23 12:08:08 +0000 |
| commit | 3ec3fcb621fef1784b75c07ea05072b95aad7efb (patch) | |
| tree | a228f2ce7132e82b99381a69afcd3f05b9737488 /regerror.c | |
| parent | 7f717c8dfc8c1d5595764ba14e527f21c60ec9d2 (diff) | |
| download | ruby-3ec3fcb621fef1784b75c07ea05072b95aad7efb.tar.gz ruby-3ec3fcb621fef1784b75c07ea05072b95aad7efb.tar.xz ruby-3ec3fcb621fef1784b75c07ea05072b95aad7efb.zip | |
merge Oniguruma 4.0.2
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regerror.c')
| -rw-r--r-- | regerror.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/regerror.c b/regerror.c index 043f52d43..f9b35dcb9 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; |