diff options
| author | Jim Meyering <jim@meyering.net> | 1995-06-01 14:12:51 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1995-06-01 14:12:51 +0000 |
| commit | 85bf8c2e1c017936d7f311f65c5c0fcae12c65f9 (patch) | |
| tree | 6c04fb52f0fa0db6182cbd6a3db48d0e6582be0e | |
| parent | f97e625d3de97f198da2ca9e8ec195856ba24961 (diff) | |
| download | coreutils-85bf8c2e1c017936d7f311f65c5c0fcae12c65f9.tar.xz | |
merge with 1.11.5
| -rw-r--r-- | lib/regex.c | 2 | ||||
| -rw-r--r-- | old/textutils/ChangeLog | 2 | ||||
| -rw-r--r-- | old/textutils/NEWS | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/regex.c b/lib/regex.c index abe92ac8b..f7e0917b0 100644 --- 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 5778dce6a..a4a9f7517 100644 --- 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 391c19339..7bc4fbf43 100644 --- 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' |