merge with 1.10i

diff --git a/lib/getdate.y b/lib/getdate.y
index 7597015609828545913c72c28bb2c37734e48e67..bb4db7e46ab17babcea574a43a84dbb87899905b 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -484,7 +484,6 @@ static TABLE const TimezoneTable[] = {
     { "idlw",  tZONE,     HOUR(12) },  /* International Date Line West */
     { "cet",   tZONE,     -HOUR(1) },  /* Central European */
     { "met",   tZONE,     -HOUR(1) },  /* Middle European */
-    { "metdst",        tDAYZONE,  -HOUR(1) },  /* Middle European Daylight */
     { "mewt",  tZONE,     -HOUR(1) },  /* Middle European Winter */
     { "mest",  tDAYZONE,  -HOUR(1) },  /* Middle European Summer */
     { "mesz",  tDAYZONE,  -HOUR(1) },  /* Middle European Summer */

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 990c31eb7526375bd512d769d0ad96b979d4f19c..3f3ae8e7694e18811312077ad3211ddcf77c6343 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,18 @@
+Sat Sep 03 00:41:53 1994  Jim Meyering  (meyering@comco.com)
+
+       * lib/Makefile.in (safe-lstat.c, safe-lstat.h, safe-stat.c,
+       safe-stat.h): Use $(srcdir) to find source files.
+       (.c.o): Use -I. to get safe-lstat.h and safe-stat.h from the
+       build directory.
+       * src/Makefile.in (incl): Add -I../lib to get lib/safe-lstat.h and
+       lib/safe-stat.h from the build directory.  From Michael I Bushnell
+       <mib@geech.gnu.ai.mit.edu>.
+
+       * Makefile.in: Remove rules to create installation directories.
+       * {src,man}/Makefile.in: Put them here instead.
+
+       * configure.in: Update to take advantage of autoconf 2.0 features.
+
 Sat Aug 27 16:57:20 1994  Jim Meyering  (meyering@comco.com)
 
        * system.h [BROKEN_STAT_MACROS]: Remove unnecessary #ifdef's.
@@ -11,7 +26,7 @@ Mon Aug 01 21:58:14 1994  Jim Meyering  (meyering@comco.com)
 
        * date.c: Add --utc option.  It will supercede --uct.
        Change references to `universal coordinated time' to
-       coorect `coordinated universal time'.  From Harris Boldt Edelman
+       correct `coordinated universal time'.  From Harris Boldt Edelman
        <hbe@red-eft.la.ca.us>.
        * date.1: Correct the documentation, too.
 

diff --git a/src/stty.c b/src/stty.c
index b75caf8cc42ba5e807f167dd7508eaf5e679e23a..2663cf4a390172b50b446cc202874affdbc519bd 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -271,6 +271,10 @@ static struct mode_info mode_info[] =
   {"tab2", output, SANE_UNSET, TAB2, TABDLY},
   {"tab1", output, SANE_UNSET, TAB1, TABDLY},
   {"tab0", output, SANE_SET, TAB0, TABDLY},
+#else
+#ifdef OXTABS
+  {"tab3", output, SANE_UNSET, OXTABS, 0},
+#endif
 #endif
 #ifdef BSDLY
   {"bs1", output, SANE_UNSET, BS1, BSDLY},
@@ -329,7 +333,7 @@ static struct mode_info mode_info[] =
 #ifdef IXANY
   {"decctlq", combination, REV | OMIT, 0, 0},
 #endif
-#ifdef TABDLY
+#if defined (TABDLY) || defined (OXTABS)
   {"tabs", combination, REV | OMIT, 0, 0},
 #endif
 #if defined(XCASE) && defined(IUCLC) && defined(OLCUC)
@@ -1063,6 +1067,16 @@ set_mode (info, reversed, mode)
          else
            mode->c_oflag = (mode->c_oflag & ~TABDLY) | TAB0;
        }
+#else
+#ifdef OXTABS
+      else if (!strcmp (info->name, "tabs"))
+       {
+         if (reversed)
+           mode->c_oflag = mode->c_oflag | OXTABS;
+         else
+           mode->c_oflag = mode->c_oflag & ~OXTABS;
+       }
+#endif
 #endif
 #if defined(XCASE) && defined(IUCLC) && defined(OLCUC)
       else if (!strcmp (info->name, "lcase")