merge with 1.10b + local build mods

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index c0231ef8c76bb8761e478f2db36309bba12db3f6..4543f1dee2f172057242803c72946df38f86d6ab 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,19 @@
+Sun Jun 19 00:18:06 1994  Jim Meyering  (meyering@comco.com)
+
+       * nice.c (main): Accept options like `--5' (equivalent to `-n -5')
+       instead of letting getopt give an `unrecognized option' error.
+
+Thu Jun 02 14:11:31 1994  Jim Meyering  (meyering@comco.com)
+
+       * stty.c (main): Set max_col and current_col before running
+       display_window_size.  Otherwise, `stty size' output a spurious
+       newline.  From Bauke Jan Douma (bjdouma@xs4all.hacktic.nl).
+
+Mon May 30 09:33:53 1994  Jim Meyering  (meyering@comco.com)
+
+       * test.c (test_syntax_error, beyond): Add __attribute__ ((noreturn))
+       so gcc will know enough not to give warnings.
+
 Sun May 29 17:40:21 1994  Jim Meyering  (meyering@comco.com)
 
        * long-options.c: Move from src/ to lib/.

diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index 27afdfaeb866dec4c4dd79fd8167b4a34afb9ff3..7d91f5d7d9ac9cd96e22c22578f531642f4b7837 100644 (file)
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,3 +1,5 @@
+User visible changes in release 1.11
+* nice accepts options like `--5' (this is interpreted like `-n -5')
 User visible changes in release 1.10
 * change package name from shellutils to sh-utils
 * add hostname, pwd, and users commands