# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 802015977 0
# Node ID 2c92405432fefd55b2347d59c580ab3aeaec4069
# Parent  c29f67a3f852b3444cd240b8a4c99fe93622ee30
merge with 1.11.5

diff --git a/lib/regex.c b/lib/regex.c
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -2756,7 +2756,7 @@
 {
   const char *next = p;
   boolean next_backslash = *next == '\\';
-  const char *next_next = p + 1 < pend ? p + 1 : NULL;
+  const char *next_next = p + 1 < pend ? p + 1 : 0;
   
   return
        /* Before a subexpression?  */