merge with 1.10j

4 files changed, 24 insertions, 15 deletions

diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index d7911ce24..369e52843 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -24,7 +24,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.1 $
+\deftexinfoversion$Revision: 1.2 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % Print the version number if in a .fmt file.
@@ -3551,7 +3551,7 @@ July\or August\or September\or October\or November\or December\fi
 % #1 is the data type, #2 the name, #3 the args.
 \def\deftypefunheaderx #1#2 #3\relax{%
 \doind {fn}{\code{#2}}% Make entry in function index
-\begingroup\defname {\code{#1} #2}{Function}%
+\begingroup\defname {\defheaderxcond#1\relax$$$#2}{Function}%
 \deftypefunargs {#3}\endgroup %
 \catcode 61=\other % Turn off change made in \defparsebody
 }
@@ -3560,6 +3560,10 @@ July\or August\or September\or October\or November\or December\fi
 
 \def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
 
+% \defheaderxcond#1\relax$$$
+% puts #1 in @code, followed by a space, but does nothing if #1 is null.
+\def\defheaderxcond#1#2$$${\ifx#1\relax\else\code{#1#2} \fi}
+
 % #1 is the classification.  #2 is the data type.  #3 is the name and args.
 \def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}
 % #1 is the classification, #2 the data type, #3 the name, #4 the args.
@@ -3568,7 +3572,7 @@ July\or August\or September\or October\or November\or December\fi
 \begingroup
 \normalparens % notably, turn off `&' magic, which prevents
 %               at least some C++ text from working
-\defname {\code{#2} #3}{#1}%
+\defname {\defheaderxcond#2\relax$$$#3}{#1}%
 \deftypefunargs {#4}\endgroup %
 \catcode 61=\other % Turn off change made in \defparsebody
 }
@@ -3696,7 +3700,7 @@ July\or August\or September\or October\or November\or December\fi
 % #1 is the data type.  #2 is the name.
 \def\deftypevarheader #1#2{%
 \doind {vr}{\code{#2}}% Make entry in variables index
-\begingroup\defname {\code{#1} #2}{Variable}%
+\begingroup\defname {\defheaderxcond#1\relax$$$#2}{Variable}%
 \interlinepenalty=10000
 \endgraf\penalty 10000\vskip -\parskip\penalty 10000
 \endgroup}
@@ -3706,7 +3710,7 @@ July\or August\or September\or October\or November\or December\fi
 \def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
 
 \def\deftypevrheader #1#2#3{\doind {vr}{\code{#3}}%
-\begingroup\defname {\code{#2} #3}{#1}
+\begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1}
 \interlinepenalty=10000
 \endgraf\penalty 10000\vskip -\parskip\penalty 10000
 \endgroup}
diff --git a/lib/getdate.y b/lib/getdate.y
index bb4db7e46..1204a1de2 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -867,16 +867,16 @@ difftm (a, b)
 {
   int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
   int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
-  int days = (
-	      /* difference in day of year */
-	      a->tm_yday - b->tm_yday
-	      /* + intervening leap days */
-	      +  ((ay >> 2) - (by >> 2))
-	      -  (ay/100 - by/100)
-	      +  ((ay/100 >> 2) - (by/100 >> 2))
-	      /* + difference in years * 365 */
-	      +  (long)(ay-by) * 365
-	      );
+  long days = (
+	       /* difference in day of year */
+	       a->tm_yday - b->tm_yday
+	       /* + intervening leap days */
+	       +  ((ay >> 2) - (by >> 2))
+	       -  (ay/100 - by/100)
+	       +  ((ay/100 >> 2) - (by/100 >> 2))
+	       /* + difference in years * 365 */
+	       +  (long)(ay-by) * 365
+	       );
   return (60*(60*(24*days + (a->tm_hour - b->tm_hour))
 	      + (a->tm_min - b->tm_min))
 	  + (a->tm_sec - b->tm_sec));
diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 3f3ae8e76..cd8ea4c41 100644
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 15 19:10:51 1994  Jim Meyering  (meyering@comco.com)
+
+	* stty.c [VWERSE && !VWERASE]: Define VWERASE for AIX-3.2.5.
+
 Sat Sep 03 00:41:53 1994  Jim Meyering  (meyering@comco.com)
 
 	* lib/Makefile.in (safe-lstat.c, safe-lstat.h, safe-stat.c,
diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index 5c639b924..660dc795f 100644
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,4 +1,5 @@
 User visible changes in release 1.11
+* `stty werase ^W' works.  Before, werase wasn't enabled for AIX-3.2.5.
 * nice accepts options like `--5' (this is interpreted like `-n -5')
 * `stty speed' and `stty size' no longer output a spurious newline
 User visible changes in release 1.10