merge with 1.10u

diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index bd0196c..f4cf244 100644 (file)
--- 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.4 $
+\deftexinfoversion$Revision: 1.5 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % Print the version number if in a .fmt file.
@@ -2845,6 +2845,7 @@ July\or August\or September\or October\or November\or December\fi
    \unnumbchapmacro{#1}\def\thischapter{}%
    \begingroup                 % Set up to handle contents files properly.
       \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
+      \catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
       \raggedbottom             % Worry more about breakpoints than the bottom.
       \advance\hsize by -\contentsrightmargin % Don't use the full line length.
 }

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 1b48189..a797537 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,5 +1,15 @@
+Sun Oct 23 23:36:26 1994  Jim Meyering  (meyering@comco.com)
+
+       * safe-xstat.hin: Don't use a statement expression here.
+       Use an inline function instead.  
+       * safe-xstat.cin: Don't duplicate the definition of safe_l?stat here.
+       Get the definition from safe-xstat.hin.
+
 Fri Oct 21 00:57:23 1994  Jim Meyering  (meyering@comco.com)
 
+       * man/Makefile.in: Fix typo that had su.1 being installed as
+       `man/man1/.1'.  From Kjetil Torgrim Homme.
+
        * basename.c, dirname.c, expr.c, pathchk.c, sleep.c (main): Diagnose
        wrong number of argument -- usually too few -- instead of just
        referring the user to the --help option.  Reported by Karl Berry.