merge with 1.11.5

diff --git a/lib/regex.c b/lib/regex.c
index abe92ac8b7d5cc9e4db99869a05de24d5e7c4f89..f7e0917b0548c7135191ef49f7eb50b10901eca2 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -2756,7 +2756,7 @@ at_endline_loc_p (p, pend, syntax)
 {
   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?  */

diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index 5778dce6a6c74b0bac7a71ea253532baef8d74a7..a4a9f75171814e35dafd71d0d5040c325eb5e419 100644 (file)
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -15,8 +15,6 @@ Sat May 27 00:35:47 1995  Jim Meyering  (meyering@comco.com)
 
 Thu May 25 00:06:50 1995  Jim Meyering  (meyering@comco.com)
 
-       * Version 1.11.4.
-
        * tail.c (tail_lines): Change one more `long' to `off_t'.
        Otherwise, tail didn't work on NetBSD.  From by Arne H. Juul.
 

diff --git a/old/textutils/NEWS b/old/textutils/NEWS
index 391c193391b38c3b29e3685137ace6cd9194ef61..7bc4fbf437b58d87cd2752363886b241ca6f72cc 100644 (file)
--- a/old/textutils/NEWS
+++ b/old/textutils/NEWS
@@ -1,4 +1,5 @@
 User-visible changes in release 1.12
+* all --help messages have been improved
 * join's -a1 and -a2 options work
 * tr '[:upper:]' '[:lower:]' no longer reads uninitialized memory
 * sort properly handles command line arguments like `+7.2n'