merge with 1.9.2j

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index d34ba58..f825560 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 11 19:39:37 1994  Jim Meyering  (meyering@comco.com)
+
+       * stty.c (get_win_size): Don't use an ANSI-style function
+       definition.  From Kaveh R. Ghazi <ghazi@noc.rutgers.edu>.
+
 Thu Feb 10 01:22:37 1994  Jim Meyering  (meyering@comco.com)
 
        * stty.c [CSWTCH] (__sparc__ && __svr4__): Define `swtch' to

diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index e22385b..70292f8 100644 (file)
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -2,7 +2,7 @@ User visible changes in release 1.9.3
 * stty defaults `swtch' to undefined for Solaris so `susp' (^Z) will work.
   Before, with the default settings ^Z did nothing.
 * stty no longer gives an error message when it finds a spurious difference
-  (due to buggy tcsetattr/tcsetattr) between requested and current tty
+  (due to buggy tcgetattr/tcsetattr) between requested and current tty
   modes under SunOS 4.1.x.
 * stty no longer fails if the ioctl to determine the display width fails
   when displaying settings.