From af9bcb7f134511ae5e43b746803f00bebe48b118 Mon Sep 17 00:00:00 2001
From: "Philip.Hazel" <Philip.Hazel@gmail.com>
Date: Mon, 19 Feb 2018 16:55:47 +0000
Subject: [PATCH] Fix pcre2test -C to correctly show what \R matches.

---
 ChangeLog       | 5 +++++
 configure.ac    | 6 +++---
 src/pcre2.h     | 6 +++---
 src/pcre2test.c | 3 ++-
 4 files changed, 13 insertions(+), 7 deletions(-)

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
 "<unset>", 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 ":"");