diff --git a/ChangeLog b/ChangeLog index d655fdc..ccc3134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,11 @@ group that did capture something were not being correctly returned as "unset" groups altogether. Now it shows those that come before any actual captures as "", as happens for non-POSIX matching. +3. Running "pcre2test -C" always stated "\R matches CR, LF, or CRLF only", +whatever the build configuration was. It now correctly says "\R matches all +Unicode newlines" in the default case when --enable-bsr-anycrlf has not been +specified. + Version 10.31 12-February-2018 ------------------------------ diff --git a/configure.ac b/configure.ac index 2164e4c..ae4ca15 100644 --- a/configure.ac +++ b/configure.ac @@ -9,9 +9,9 @@ dnl The PCRE2_PRERELEASE feature is for identifying release candidates. It might dnl be defined as -RC2, for example. For real releases, it should be empty. m4_define(pcre2_major, [10]) -m4_define(pcre2_minor, [31]) -m4_define(pcre2_prerelease, []) -m4_define(pcre2_date, [2018-02-12]) +m4_define(pcre2_minor, [32]) +m4_define(pcre2_prerelease, [-RC1]) +m4_define(pcre2_date, [2018-02-19]) # NOTE: The CMakeLists.txt file searches for the above variables in the first # 50 lines of this file. Please update that if the variables above are moved. diff --git a/src/pcre2.h b/src/pcre2.h index fffcc30..6ed08ef 100644 --- a/src/pcre2.h +++ b/src/pcre2.h @@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE. /* The current PCRE version information. */ #define PCRE2_MAJOR 10 -#define PCRE2_MINOR 31 -#define PCRE2_PRERELEASE -#define PCRE2_DATE 2018-02-12 +#define PCRE2_MINOR 32 +#define PCRE2_PRERELEASE -RC1 +#define PCRE2_DATE 2018-02-19 /* When an application links to a PCRE DLL in Windows, the symbols that are imported have to be identified as such. When building PCRE2, the appropriate diff --git a/src/pcre2test.c b/src/pcre2test.c index 7eca618..40e2161 100644 --- a/src/pcre2test.c +++ b/src/pcre2test.c @@ -7877,7 +7877,8 @@ else (void)PCRE2_CONFIG(PCRE2_CONFIG_NEWLINE, &optval); print_newline_config(optval, FALSE); (void)PCRE2_CONFIG(PCRE2_CONFIG_BSR, &optval); -printf(" \\R matches %s\n", optval? "CR, LF, or CRLF only" : +printf(" \\R matches %s\n", + (optval == PCRE2_BSR_ANYCRLF)? "CR, LF, or CRLF only" : "all Unicode newlines"); (void)PCRE2_CONFIG(PCRE2_CONFIG_NEVER_BACKSLASH_C, &optval); printf(" \\C is %ssupported\n", optval? "not ":"");