Merge in texinfo-3.12.

git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@18811 138bc75d-0d04-0410-961f-82ee72b054a4

15 files changed, 390 insertions, 264 deletions

diff --git a/texinfo/info/Makefile.am b/texinfo/info/Makefile.am
index 15db3668cc6..47073ae3343 100644
--- a/texinfo/info/Makefile.am
+++ b/texinfo/info/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/info.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:05:58 law Exp $
+## $Id: Makefile.am,v 1.1.1.2 1998/03/24 18:20:06 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 noinst_PROGRAMS = makedoc
@@ -13,7 +13,10 @@ transform = s/ginfo/info/; @program_transform_name@
 localedir = $(datadir)/locale
 
 # -I. for funs.h.
-INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+# Automake puts -I.. and -I$(srcdir) into DEFS by default, but
+# we need to override it, so include them ourselves.
+INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
+DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = ../lib/libtxi.a @TERMLIBS@ @INTLLIBS@
 
 makedoc_SOURCES = makedoc.c
@@ -32,13 +35,11 @@ EXTRA_DIST = README
 # files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
 # listing the functions found.  `doc.c' is a structure containing pointers
 # to those functions along with completable names and documentation strings.
-# 
-# I do not know how to get this right.
-# BUILT_SOURCES = doc.c funs.h
-#
-#cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
-#  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
-#  $(srcdir)/footnotes.c $(srcdir)/variables.c
-#
-#$(BUILTSOURCES): makedoc $(cmd_sources)
-#	./makedoc $(cmd_sources)
+BUILT_SOURCES = doc.c funs.h
+
+cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
+  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
+  $(srcdir)/footnotes.c $(srcdir)/variables.c
+
+$(BUILT_SOURCES): makedoc $(cmd_sources)
+	./makedoc $(cmd_sources)
diff --git a/texinfo/info/Makefile.in b/texinfo/info/Makefile.in
index 24c555e3459..c71d31959ec 100644
--- a/texinfo/info/Makefile.in
+++ b/texinfo/info/Makefile.in
@@ -1,8 +1,14 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
 SHELL = /bin/sh
@@ -42,27 +48,26 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -89,7 +94,10 @@ transform = s/ginfo/info/; @program_transform_name@
 localedir = $(datadir)/locale
 
 # -I. for funs.h.
-INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+# Automake puts -I.. and -I$(srcdir) into DEFS by default, but
+# we need to override it, so include them ourselves.
+INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
+DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = ../lib/libtxi.a @TERMLIBS@ @INTLLIBS@
 
 makedoc_SOURCES = makedoc.c
@@ -103,15 +111,21 @@ ginfo_SOURCES = dir.c display.c display.h doc.c doc.h dribble.c dribble.h \
   variables.c variables.h window.c window.h
 
 EXTRA_DIST = README
+
+# The files `doc.c' and `funs.h' are created by ./makedoc run over the source
+# files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
+# listing the functions found.  `doc.c' is a structure containing pointers
+# to those functions along with completable names and documentation strings.
+BUILT_SOURCES = doc.c funs.h
+
+cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
+  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
+  $(srcdir)/footnotes.c $(srcdir)/variables.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  ginfo$(EXEEXT)
-noinst_PROGRAMS =  makedoc$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -142,9 +156,9 @@ OBJECTS = $(ginfo_OBJECTS) $(makedoc_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus info/Makefile
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps info/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -154,7 +168,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
-	test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 distclean-binPROGRAMS:
 
@@ -171,7 +185,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	done
 
 uninstall-binPROGRAMS:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
@@ -179,7 +193,7 @@ uninstall-binPROGRAMS:
 mostlyclean-noinstPROGRAMS:
 
 clean-noinstPROGRAMS:
-	test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 
 distclean-noinstPROGRAMS:
 
@@ -188,41 +202,52 @@ maintainer-clean-noinstPROGRAMS:
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
-	rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
 
-ginfo$(EXEEXT): $(ginfo_OBJECTS) $(ginfo_DEPENDENCIES)
-	@rm -f ginfo$(EXEEXT)
+ginfo: $(ginfo_OBJECTS) $(ginfo_DEPENDENCIES)
+	@rm -f ginfo
 	$(LINK) $(ginfo_LDFLAGS) $(ginfo_OBJECTS) $(ginfo_LDADD) $(LIBS)
 
-makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
-	@rm -f makedoc$(EXEEXT)
+makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
+	@rm -f makedoc
 	$(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -232,17 +257,112 @@ subdir = info
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+dir.o: dir.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h tilde.h
+display.o: display.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+doc.o: doc.c doc.h info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h footnotes.h gc.h \
+	funs.h
+dribble.o: dribble.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+echo-area.o: echo-area.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+filesys.o: filesys.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h tilde.h
+footnotes.o: footnotes.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+gc.o: gc.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h
+indices.o: indices.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h indices.h
+info-utils.o: info-utils.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h man.h
+info.o: info.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h \
+	indices.h ../lib/getopt.h man.h
+infodoc.o: infodoc.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+infomap.o: infomap.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h funs.h
+m-x.o: m-x.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h
+makedoc.o: makedoc.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+man.o: man.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h \
+	signals.h tilde.h man.h
+nodemenu.o: nodemenu.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+nodes.o: nodes.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h man.h
+search.o: search.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+session.o: session.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h man.h
+signals.o: signals.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h signals.h
+terminal.o: terminal.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h termdep.h
+tilde.o: tilde.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h
+variables.o: variables.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h variables.h
+window.o: window.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+
 info:
 dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-info:
 install-exec: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 
@@ -263,19 +383,19 @@ installdirs:
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
 		mostlyclean-compile mostlyclean-tags \
 		mostlyclean-generic
@@ -286,7 +406,7 @@ clean:  clean-binPROGRAMS clean-noinstPROGRAMS clean-compile clean-tags \
 distclean:  distclean-binPROGRAMS distclean-noinstPROGRAMS \
 		distclean-compile distclean-tags distclean-generic \
 		clean
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-binPROGRAMS \
 		maintainer-clean-noinstPROGRAMS \
@@ -302,25 +422,13 @@ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-info install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-# The files `doc.c' and `funs.h' are created by ./makedoc run over the source
-# files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
-# listing the functions found.  `doc.c' is a structure containing pointers
-# to those functions along with completable names and documentation strings.
-# 
-# I do not know how to get this right.
-# BUILT_SOURCES = doc.c funs.h
-#
-#cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
-#  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
-#  $(srcdir)/footnotes.c $(srcdir)/variables.c
-#
-#$(BUILTSOURCES): makedoc $(cmd_sources)
-#	./makedoc $(cmd_sources)
+$(BUILT_SOURCES): makedoc $(cmd_sources)
+	./makedoc $(cmd_sources)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/texinfo/info/README b/texinfo/info/README
index 90d3e2cd522..7e1ab327b99 100644
--- a/texinfo/info/README
+++ b/texinfo/info/README
@@ -6,8 +6,7 @@ maintain, and thus decided to write this one.
 
 The rewrite consists of about 12,000 lines of code written in about 12
 days.  I believe this version of Info to be in much better shape than the
-original Info, and the only reason it is in Beta test is because of its
-short life span.
+original Info.
 
 Info 2.0 is substantially different from its original standalone
 predecessor.  It appears almost identical to the GNU Emacs version, but has
@@ -24,8 +23,4 @@ A full listing of the commands available in Info can be gotten by typing
 `?' while within an Info window.  This produces a node in a window which
 can be viewed just like any Info node.
 
-Please send your comments, bug reports, and suggestions to
-
-	bug-texinfo@prep.ai.mit.edu
-
---Brian Fox <bfox@ai.mit.edu>
+--Brian Fox <bfox@gnu.org>
diff --git a/texinfo/info/doc.c b/texinfo/info/doc.c
index 3859b7fd66a..67383960112 100644
--- a/texinfo/info/doc.c
+++ b/texinfo/info/doc.c
@@ -24,106 +24,106 @@
 FUNCTION_DOC function_doc_array[] = {
 
 /* Commands found in "./session.c". */
-   { info_next_line, "next-line", N_("Move down to the next line") },
-   { info_prev_line, "prev-line", N_("Move up to the previous line") },
-   { info_end_of_line, "end-of-line", N_("Move to the end of the line") },
-   { info_beginning_of_line, "beginning-of-line", N_("Move to the start of the line") },
-   { info_forward_char, "forward-char", N_("Move forward a character") },
-   { info_backward_char, "backward-char", N_("Move backward a character") },
-   { info_forward_word, "forward-word", N_("Move forward a word") },
-   { info_backward_word, "backward-word", N_("Move backward a word") },
-   { info_global_next_node, "global-next-node", N_("Move forwards or down through node structure") },
-   { info_global_prev_node, "global-prev-node", N_("Move backwards or up through node structure") },
-   { info_scroll_forward, "scroll-forward", N_("Scroll forward in this window") },
-   { info_scroll_backward, "scroll-backward", N_("Scroll backward in this window") },
-   { info_beginning_of_node, "beginning-of-node", N_("Move to the start of this node") },
-   { info_end_of_node, "end-of-node", N_("Move to the end of this node") },
-   { info_next_window, "next-window", N_("Select the next window") },
-   { info_prev_window, "prev-window", N_("Select the previous window") },
-   { info_split_window, "split-window", N_("Split the current window") },
-   { info_delete_window, "delete-window", N_("Delete the current window") },
-   { info_keep_one_window, "keep-one-window", N_("Delete all other windows") },
-   { info_scroll_other_window, "scroll-other-window", N_("Scroll the other window") },
-   { info_grow_window, "grow-window", N_("Grow (or shrink) this window") },
-   { info_tile_windows, "tile-windows", N_("Divide the available screen space among the visible windows") },
-   { info_toggle_wrap, "toggle-wrap", N_("Toggle the state of line wrapping in the current window") },
-   { info_next_node, "next-node", N_("Select the `Next' node") },
-   { info_prev_node, "prev-node", N_("Select the `Prev' node") },
-   { info_up_node, "up-node", N_("Select the `Up' node") },
-   { info_last_node, "last-node", N_("Select the last node in this file") },
-   { info_first_node, "first-node", N_("Select the first node in this file") },
-   { info_history_node, "history-node", N_("Select the most recently selected node") },
-   { info_last_menu_item, "last-menu-item", N_("Select the last item in this node's menu") },
-   { info_menu_digit, "menu-digit", N_("Select this menu item") },
-   { info_menu_item, "menu-item", N_("Read a menu item and select its node") },
-   { info_xref_item, "xref-item", N_("Read a footnote or cross reference and select its node") },
-   { info_find_menu, "find-menu", N_("Move to the start of this node's menu") },
-   { info_visit_menu, "visit-menu", N_("Visit as many menu items at once as possible") },
-   { info_goto_node, "goto-node", N_("Read a node name and select it") },
-   { info_man, "man", N_("Read a manpage reference and select it") },
-   { info_top_node, "top-node", N_("Select the node `Top' in this file") },
-   { info_dir_node, "dir-node", N_("Select the node `(dir)'") },
-   { info_kill_node, "kill-node", N_("Kill this node") },
-   { info_view_file, "view-file", N_("Read the name of a file and select it") },
-   { info_print_node, "print-node", N_("Pipe the contents of this node through INFO_PRINT_COMMAND") },
-   { info_search, "search", N_("Read a string and search for it") },
-   { isearch_forward, "isearch-forward", N_("Search interactively for a string as you type it") },
-   { isearch_backward, "isearch-backward", N_("Search interactively for a string as you type it") },
-   { info_move_to_prev_xref, "move-to-prev-xref", N_("Move to the previous cross reference") },
-   { info_move_to_next_xref, "move-to-next-xref", N_("Move to the next cross reference") },
-   { info_select_reference_this_line, "select-reference-this-line", N_("Select reference or menu item appearing on this line") },
-   { info_abort_key, "abort-key", N_("Cancel current operation") },
-   { info_move_to_window_line, "move-to-window-line", N_("Move to the cursor to a specific line of the window") },
-   { info_redraw_display, "redraw-display", N_("Redraw the display") },
-   { info_quit, "quit", N_("Quit using Info") },
+   { info_next_line, "next-line", "Move down to the next line" },
+   { info_prev_line, "prev-line", "Move up to the previous line" },
+   { info_end_of_line, "end-of-line", "Move to the end of the line" },
+   { info_beginning_of_line, "beginning-of-line", "Move to the start of the line" },
+   { info_forward_char, "forward-char", "Move forward a character" },
+   { info_backward_char, "backward-char", "Move backward a character" },
+   { info_forward_word, "forward-word", "Move forward a word" },
+   { info_backward_word, "backward-word", "Move backward a word" },
+   { info_global_next_node, "global-next-node", "Move forwards or down through node structure" },
+   { info_global_prev_node, "global-prev-node", "Move backwards or up through node structure" },
+   { info_scroll_forward, "scroll-forward", "Scroll forward in this window" },
+   { info_scroll_backward, "scroll-backward", "Scroll backward in this window" },
+   { info_beginning_of_node, "beginning-of-node", "Move to the start of this node" },
+   { info_end_of_node, "end-of-node", "Move to the end of this node" },
+   { info_next_window, "next-window", "Select the next window" },
+   { info_prev_window, "prev-window", "Select the previous window" },
+   { info_split_window, "split-window", "Split the current window" },
+   { info_delete_window, "delete-window", "Delete the current window" },
+   { info_keep_one_window, "keep-one-window", "Delete all other windows" },
+   { info_scroll_other_window, "scroll-other-window", "Scroll the other window" },
+   { info_grow_window, "grow-window", "Grow (or shrink) this window" },
+   { info_tile_windows, "tile-windows", "Divide the available screen space among the visible windows" },
+   { info_toggle_wrap, "toggle-wrap", "Toggle the state of line wrapping in the current window" },
+   { info_next_node, "next-node", "Select the `Next' node" },
+   { info_prev_node, "prev-node", "Select the `Prev' node" },
+   { info_up_node, "up-node", "Select the `Up' node" },
+   { info_last_node, "last-node", "Select the last node in this file" },
+   { info_first_node, "first-node", "Select the first node in this file" },
+   { info_last_menu_item, "last-menu-item", "Select the last item in this node's menu" },
+   { info_menu_digit, "menu-digit", "Select this menu item" },
+   { info_menu_item, "menu-item", "Read a menu item and select its node" },
+   { info_xref_item, "xref-item", "Read a footnote or cross reference and select its node" },
+   { info_find_menu, "find-menu", "Move to the start of this node's menu" },
+   { info_visit_menu, "visit-menu", "Visit as many menu items at once as possible" },
+   { info_goto_node, "goto-node", "Read a node name and select it" },
+   { info_man, "man", "Read a manpage reference and select it" },
+   { info_top_node, "top-node", "Select the node `Top' in this file" },
+   { info_dir_node, "dir-node", "Select the node `(dir)'" },
+   { info_history_node, "history-node", "Select the most recently selected node" },
+   { info_kill_node, "kill-node", "Kill this node" },
+   { info_view_file, "view-file", "Read the name of a file and select it" },
+   { info_print_node, "print-node", "Pipe the contents of this node through INFO_PRINT_COMMAND" },
+   { info_search, "search", "Read a string and search for it" },
+   { isearch_forward, "isearch-forward", "Search interactively for a string as you type it" },
+   { isearch_backward, "isearch-backward", "Search interactively for a string as you type it" },
+   { info_move_to_prev_xref, "move-to-prev-xref", "Move to the previous cross reference" },
+   { info_move_to_next_xref, "move-to-next-xref", "Move to the next cross reference" },
+   { info_select_reference_this_line, "select-reference-this-line", "Select reference or menu item appearing on this line" },
+   { info_abort_key, "abort-key", "Cancel current operation" },
+   { info_move_to_window_line, "move-to-window-line", "Move to the cursor to a specific line of the window" },
+   { info_redraw_display, "redraw-display", "Redraw the display" },
+   { info_quit, "quit", "Quit using Info" },
    { info_do_lowercase_version, "do-lowercase-version", "" },
-   { info_add_digit_to_numeric_arg, "add-digit-to-numeric-arg", N_("Add this digit to the current numeric argument") },
-   { info_universal_argument, N_("universal-argument"), N_("Start (or multiply by 4) the current numeric argument") },
-   { info_numeric_arg_digit_loop, "numeric-arg-digit-loop", N_("Internally used by \\[universal-argument]") },
+   { info_add_digit_to_numeric_arg, "add-digit-to-numeric-arg", "Add this digit to the current numeric argument" },
+   { info_universal_argument, "universal-argument", "Start (or multiply by 4) the current numeric argument" },
+   { info_numeric_arg_digit_loop, "numeric-arg-digit-loop", "Internally used by \\[universal-argument]" },
 /* Commands found in "./echo-area.c". */
-   { ea_forward, "echo-area-forward", N_("Move forward a character") },
-   { ea_backward, "echo-area-backward", N_("Move backward a character") },
-   { ea_beg_of_line, "echo-area-beg-of-line", N_("Move to the start of this line") },
-   { ea_end_of_line, "echo-area-end-of-line", N_("Move to the end of this line") },
-   { ea_forward_word, "echo-area-forward-word", N_("Move forward a word") },
-   { ea_backward_word, "echo-area-backward-word", N_("Move backward a word") },
-   { ea_delete, "echo-area-delete", N_("Delete the character under the cursor") },
-   { ea_rubout, "echo-area-rubout", N_("Delete the character behind the cursor") },
-   { ea_abort, "echo-area-abort", N_("Cancel or quit operation") },
-   { ea_newline, "echo-area-newline", N_("Accept (or force completion of) this line") },
-   { ea_quoted_insert, "echo-area-quoted-insert", N_("Insert next character verbatim") },
-   { ea_insert, "echo-area-insert", N_("Insert this character") },
-   { ea_tab_insert, "echo-area-tab-insert", N_("Insert a TAB character") },
-   { ea_transpose_chars, "echo-area-transpose-chars", N_("Transpose characters at point") },
-   { ea_yank, "echo-area-yank", N_("Yank back the contents of the last kill") },
-   { ea_yank_pop, "echo-area-yank-pop", N_("Yank back a previous kill") },
-   { ea_kill_line, "echo-area-kill-line", N_("Kill to the end of the line") },
-   { ea_backward_kill_line, "echo-area-backward-kill-line", N_("Kill to the beginning of the line") },
-   { ea_kill_word, "echo-area-kill-word", N_("Kill the word following the cursor") },
-   { ea_backward_kill_word, "echo-area-backward-kill-word", N_("Kill the word preceding the cursor") },
-   { ea_possible_completions, "echo-area-possible-completions", N_("List possible completions") },
-   { ea_complete, "echo-area-complete", N_("Insert completion") },
-   { ea_scroll_completions_window, "echo-area-scroll-completions-window", N_("Scroll the completions window") },
+   { ea_forward, "echo-area-forward", "Move forward a character" },
+   { ea_backward, "echo-area-backward", "Move backward a character" },
+   { ea_beg_of_line, "echo-area-beg-of-line", "Move to the start of this line" },
+   { ea_end_of_line, "echo-area-end-of-line", "Move to the end of this line" },
+   { ea_forward_word, "echo-area-forward-word", "Move forward a word" },
+   { ea_backward_word, "echo-area-backward-word", "Move backward a word" },
+   { ea_delete, "echo-area-delete", "Delete the character under the cursor" },
+   { ea_rubout, "echo-area-rubout", "Delete the character behind the cursor" },
+   { ea_abort, "echo-area-abort", "Cancel or quit operation" },
+   { ea_newline, "echo-area-newline", "Accept (or force completion of) this line" },
+   { ea_quoted_insert, "echo-area-quoted-insert", "Insert next character verbatim" },
+   { ea_insert, "echo-area-insert", "Insert this character" },
+   { ea_tab_insert, "echo-area-tab-insert", "Insert a TAB character" },
+   { ea_transpose_chars, "echo-area-transpose-chars", "Transpose characters at point" },
+   { ea_yank, "echo-area-yank", "Yank back the contents of the last kill" },
+   { ea_yank_pop, "echo-area-yank-pop", "Yank back a previous kill" },
+   { ea_kill_line, "echo-area-kill-line", "Kill to the end of the line" },
+   { ea_backward_kill_line, "echo-area-backward-kill-line", "Kill to the beginning of the line" },
+   { ea_kill_word, "echo-area-kill-word", "Kill the word following the cursor" },
+   { ea_backward_kill_word, "echo-area-backward-kill-word", "Kill the word preceding the cursor" },
+   { ea_possible_completions, "echo-area-possible-completions", "List possible completions" },
+   { ea_complete, "echo-area-complete", "Insert completion" },
+   { ea_scroll_completions_window, "echo-area-scroll-completions-window", "Scroll the completions window" },
 /* Commands found in "./infodoc.c". */
-   { info_get_help_window, "get-help-window", N_("Display help message") },
-   { info_get_info_help_node, "get-info-help-node", N_("Visit Info node `(info)Help'") },
-   { describe_key, "describe-key", N_("Print documentation for KEY") },
-   { info_where_is, "where-is", N_("Show what to type to execute a given command") },
+   { info_get_help_window, "get-help-window", "Display help message" },
+   { info_get_info_help_node, "get-info-help-node", "Visit Info node `(info)Help'" },
+   { describe_key, "describe-key", "Print documentation for KEY" },
+   { info_where_is, "where-is", "Show what to type to execute a given command" },
 /* Commands found in "./m-x.c". */
-   { describe_command, "describe-command", N_("Read the name of an Info command and describe it") },
-   { info_execute_command, "execute-command", N_("Read a command name in the echo area and execute it") },
-   { set_screen_height, "set-screen-height", N_("Set the height of the displayed window") },
+   { describe_command, "describe-command", "Read the name of an Info command and describe it" },
+   { info_execute_command, "execute-command", "Read a command name in the echo area and execute it" },
+   { set_screen_height, "set-screen-height", "Set the height of the displayed window" },
 /* Commands found in "./indices.c". */
-   { info_index_search, "index-search", N_("Look up a string in the index for this file") },
-   { info_next_index_match, "next-index-match", N_("Go to the next matching index item from the last `\\[index-search]' command") },
-   { info_index_apropos, "index-apropos", N_("Grovel all known info file's indices for a string and build a menu") },
+   { info_index_search, "index-search", "Look up a string in the index for this file" },
+   { info_next_index_match, "next-index-match", "Go to the next matching index item from the last `\\[index-search]' command" },
+   { info_index_apropos, "index-apropos", "Grovel all known info file's indices for a string and build a menu" },
 /* Commands found in "./nodemenu.c". */
-   { list_visited_nodes, "list-visited-nodes", N_("Make a window containing a menu of all of the currently visited nodes") },
-   { select_visited_node, "select-visited-node", N_("Select a node which has been previously visited in a visible window") },
+   { list_visited_nodes, "list-visited-nodes", "Make a window containing a menu of all of the currently visited nodes" },
+   { select_visited_node, "select-visited-node", "Select a node which has been previously visited in a visible window" },
 /* Commands found in "./footnotes.c". */
-   { info_show_footnotes, "show-footnotes", N_("Show the footnotes associated with this node in another window") },
+   { info_show_footnotes, "show-footnotes", "Show the footnotes associated with this node in another window" },
 /* Commands found in "./variables.c". */
-   { describe_variable, "describe-variable", N_("Explain the use of a variable") },
-   { set_variable, "set-variable", N_("Set the value of an Info variable") },
+   { describe_variable, "describe-variable", "Explain the use of a variable" },
+   { set_variable, "set-variable", "Set the value of an Info variable" },
    { (VFunction *)NULL, (char *)NULL, (char *)NULL }
 };
diff --git a/texinfo/info/echo-area.c b/texinfo/info/echo-area.c
index 6cc0199689f..2c80d23d77c 100644
--- a/texinfo/info/echo-area.c
+++ b/texinfo/info/echo-area.c
@@ -1,7 +1,7 @@
 /* echo-area.c -- How to read a line in the echo area.
-   $Id: echo-area.c,v 1.2 1998/03/24 18:06:11 law Exp $
+   $Id: echo-area.c,v 1.1.1.2 1998/03/24 18:20:08 law Exp $
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -938,11 +938,9 @@ DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions"))
       int limit, count, max_label = 0;
 
       initialize_message_buffer ();
-      printf_to_message_buffer
-        (_("There %s %d "), completions_found_index == 1 ? _("is") : _("are"),
-         completions_found_index);
-      printf_to_message_buffer
-        (_("completion%s:\n"), completions_found_index == 1 ? "" : "s");
+      printf_to_message_buffer (completions_found_index == 1
+                                ? _("One completion:\n")
+                                : _("%d completions:\n"));
 
       /* Find the maximum length of a label. */
       for (i = 0; i < completions_found_index; i++)
diff --git a/texinfo/info/echo-area.h b/texinfo/info/echo-area.h
index 9f948c1037e..8787de92d4a 100644
--- a/texinfo/info/echo-area.h
+++ b/texinfo/info/echo-area.h
@@ -1,5 +1,5 @@
 /* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.2 1998/03/24 18:06:12 law Exp $
+   $Id: echo-area.h,v 1.1.1.2 1998/03/24 18:20:09 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/filesys.c b/texinfo/info/filesys.c
index 6d449743aaa..36287ab1f6a 100644
--- a/texinfo/info/filesys.c
+++ b/texinfo/info/filesys.c
@@ -1,7 +1,7 @@
 /* filesys.c -- File system specific functions for hacking this system.
-   $Id: filesys.c,v 1.2 1998/03/24 18:06:16 law Exp $
+   $Id: filesys.c,v 1.1.1.3 1998/03/24 18:20:10 law Exp $
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@ static char *info_suffixes[] = {
   "",
   ".info",
   "-info",
+  "/index",
   (char *)NULL
 };
 
diff --git a/texinfo/info/funs.h b/texinfo/info/funs.h
index 45fcb6ae274..32d80d51c03 100644
--- a/texinfo/info/funs.h
+++ b/texinfo/info/funs.h
@@ -29,7 +29,6 @@ extern void info_prev_node ();
 extern void info_up_node ();
 extern void info_last_node ();
 extern void info_first_node ();
-extern void info_history_node ();
 extern void info_last_menu_item ();
 extern void info_menu_digit ();
 extern void info_menu_item ();
@@ -40,6 +39,7 @@ extern void info_goto_node ();
 extern void info_man ();
 extern void info_top_node ();
 extern void info_dir_node ();
+extern void info_history_node ();
 extern void info_kill_node ();
 extern void info_view_file ();
 extern void info_print_node ();
diff --git a/texinfo/info/info.c b/texinfo/info/info.c
index 6642182c6e1..22b831a20ef 100644
--- a/texinfo/info/info.c
+++ b/texinfo/info/info.c
@@ -1,7 +1,7 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.2 1998/03/24 18:06:30 law Exp $
+   $Id: info.c,v 1.1.1.3 1998/03/24 18:20:13 law Exp $
 
-   Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 96, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,8 +29,10 @@
 
 /* The version numbers of this version of Info. */
 int info_major_version = 2;
-int info_minor_version = 17;
-int info_patch_level = 0;
+int info_minor_version = 18;
+
+/* basename (argv[0]) */
+static char *program_name = NULL;
 
 /* Non-zero means search all indices for APROPOS_SEARCH_STRING. */
 static int apropos_p = 0;
@@ -100,7 +102,7 @@ static char *short_options = "d:n:f:o:s";
 int info_windows_initialized_p = 0;
 
 /* Some "forward" declarations. */
-static void usage (), info_short_help (), remember_info_program_name ();
+static void info_short_help (), remember_info_program_name ();
 
 
 /* **************************************************************** */
@@ -207,7 +209,8 @@ main (argc, argv)
           break;
 
         default:
-          usage ();
+          fprintf (stderr, _("Try --help for more information."));
+          exit (1);
         }
     }
 
@@ -223,11 +226,13 @@ main (argc, argv)
   /* If the user specified --version, then show the version and exit. */
   if (print_version_p)
     {
-      printf ("info (GNU %s %s) %s\n", PACKAGE, VERSION, version_string ());
-      puts ("Copyright (C) 1997 Free Software Foundation, Inc.\n\
+      printf ("%s (GNU %s %s) %s\n", program_name, PACKAGE, VERSION, 
+              version_string ());
+      printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.");
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
       exit (0);
     }
 
@@ -238,7 +243,10 @@ For more information about these matters, see the files named COPYING.");
       exit (0);
     }
   
-  /* If the user hasn't specified a path for Info files, default it.  */
+  /* If the user hasn't specified a path for Info files, default it.
+     Lowest priority is our messy hardwired list in filesys.h.
+     Then comes the user's INFODIR from the Makefile.
+     Highest priority is the environment variable, if set.  */
   if (!infopath)
     {
       char *path_from_env = getenv ("INFOPATH");
@@ -252,10 +260,18 @@ For more information about these matters, see the files named COPYING.");
               path_from_env[len - 1] = 0;
               info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
             }
+#ifdef INFODIR /* from the Makefile */
+          info_add_path (INFODIR, INFOPATH_PREPEND);
+#endif
           info_add_path (path_from_env, INFOPATH_PREPEND);
         }
       else
-        info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
+        {
+          info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
+#ifdef INFODIR /* from the Makefile */
+         info_add_path (INFODIR, INFOPATH_PREPEND);
+#endif
+        }
     }
 
   /* If the user specified a particular filename, add the path of that
@@ -517,19 +533,12 @@ version_string ()
     {
       vstring = (char *)xmalloc (50);
       sprintf (vstring, "%d.%d", info_major_version, info_minor_version);
-      if (info_patch_level)
-        sprintf (vstring + strlen (vstring), "-p%d", info_patch_level);
     }
   return (vstring);
 }
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 Error Handling for Info                          */
-/*                                                                  */
-/* **************************************************************** */
 
-static char *program_name = (char *)NULL;
+
+/* Error handling.  */
 
 static void
 remember_info_program_name (fullpath)
@@ -586,44 +595,33 @@ info_error (format, arg1, arg2)
     }
 }
 
-/* Produce a very brief descripton of the available options and exit with
-   an error. */
-static void
-usage ()
-{
-  fprintf (stderr,"%s\n%s\n%s\n%s\n%s\n",
-_("Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."),
-_("            [--directory dir-path] [--file info-file] [--node node-name]..."),
-_("            [--help] [--output output-file] [--subnodes] [--version]"),
-_("            [--dribble dribble-file] [--restore from-file]"),
-_("            [menu-selection ...]"));
-  exit (1);
-}
-
 /* Produce a scaled down description of the available options to Info. */
 static void
 info_short_help ()
 {
-  puts (_("\
-Here is a quick description of Info's options.  For a more complete\n\
-description of how to use Info, type `info info options'.\n\
+  printf (_("\
+Usage: %s [OPTION]... [INFO-FILE [MENU-ITEM...]]\n\
+\n\
+Read documentation in Info format.\n\
+For more complete documentation on how to use Info, run `info info options'.\n\
 \n\
-   --directory DIR              Add DIR to INFOPATH.\n\
-   --dribble FILENAME           Remember user keystrokes in FILENAME.\n\
-   --file FILENAME              Specify Info file to visit.\n\
-   --node NODENAME              Specify nodes in first visited Info file.\n\
-   --output FILENAME            Output selected nodes to FILENAME.\n\
-   --restore FILENAME           Read initial keystrokes from FILENAME.\n\
-   --subnodes                   Recursively output menu items.\n\
-   --help                       Get this help message.\n\
-   --version                    Display Info's version information.\n\
+Options:\n\
+--directory DIR              add DIR to INFOPATH.\n\
+--dribble FILENAME           remember user keystrokes in FILENAME.\n\
+--file FILENAME              specify Info file to visit.\n\
+--node NODENAME              specify nodes in first visited Info file.\n\
+--output FILENAME            output selected nodes to FILENAME.\n\
+--restore FILENAME           read initial keystrokes from FILENAME.\n\
+--subnodes                   recursively output menu items.\n\
+--help                       display this help and exit.\n\
+--version                    display version information and exit.\n\
 \n\
-Remaining arguments to Info are treated as the names of menu\n\
-items in the initial node visited.  You can easily move to the\n\
-node of your choice by specifying the menu names which describe\n\
-the path to that node.  For example, `info emacs buffers'.\n\
+The first argument, if present, is the name of the Info file to read.\n\
+Any remaining arguments are treated as the names of menu\n\
+items in the initial node visited.  For example, `info emacs buffers'\n\
+moves to the node `buffers' in the info file `emacs'.\n\
 \n\
-Email bug reports to bug-texinfo@prep.ai.mit.edu."));
+Email bug reports to bug-texinfo@gnu.org."), program_name);
 
   exit (0);
 }
diff --git a/texinfo/info/info.h b/texinfo/info/info.h
index a0c78f80f48..22ad7bdf2f4 100644
--- a/texinfo/info/info.h
+++ b/texinfo/info/info.h
@@ -1,10 +1,10 @@
 /* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.2 1998/03/24 18:06:31 law Exp $
+   $Id: info.h,v 1.1.1.3 1998/03/24 18:20:14 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ extern int info_error_rings_bell_p;
 extern void info_error ();
 
 /* The version numbers of Info. */
-extern int info_major_version, info_minor_version, info_patch_level;
+extern int info_major_version, info_minor_version;
 
 /* How to get the version string for this version of Info.  Returns
    something similar to "2.11". */
diff --git a/texinfo/info/session.c b/texinfo/info/session.c
index e99301b8d0d..04a548bfb51 100644
--- a/texinfo/info/session.c
+++ b/texinfo/info/session.c
@@ -1,5 +1,5 @@
 /* session.c -- The user windowing interface to Info.
-   $Id: session.c,v 1.2 1998/03/24 18:06:46 law Exp $
+   $Id: session.c,v 1.1.1.3 1998/03/24 18:20:15 law Exp $
 
    Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
 
@@ -4206,7 +4206,20 @@ info_get_input_char ()
          out how many characters are currently buffered, we
          should stay with away from stream I/O.
          --Egil Kvaleberg <egilk@sn.no>, January 1997.  */
+#ifdef EINTR
+      /* Keep reading if we got EINTR, so that we don't just exit.
+         --Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>,
+         22 Dec 1997.  */
+      {
+        int n;
+        do
+	  n = read (tty, &c, 1);
+        while (n == -1 && errno == EINTR);
+        rawkey = n == 1 ? c : EOF;
+      }
+#else
       rawkey = (read (tty, &c, 1) == 1) ? c : EOF;
+#endif
 
       keystroke = rawkey;
 
diff --git a/texinfo/info/termdep.h b/texinfo/info/termdep.h
index 09c03e2f913..58e20761029 100644
--- a/texinfo/info/termdep.h
+++ b/texinfo/info/termdep.h
@@ -1,5 +1,5 @@
 /* termdep.h -- System things that terminal.c depends on.
-   $Id: termdep.h,v 1.4 1998/03/24 18:06:50 law Exp $
+   $Id: termdep.h,v 1.5 1998/03/24 19:40:54 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
@@ -33,11 +33,6 @@
 
 #ifdef HAVE_TERMIOS_H
 #  include <termios.h>
- /*
-    POSIX does not mandate that we have these and it may, in fact, be only
-    partially implemented.
-  */
-#  undef TIOCGETC
 #else
 #  if defined (HAVE_TERMIO_H)
 #    include <termio.h>
diff --git a/texinfo/info/terminal.c b/texinfo/info/terminal.c
index 9b90e5de9e1..d77d89e90f6 100644
--- a/texinfo/info/terminal.c
+++ b/texinfo/info/terminal.c
@@ -1,8 +1,8 @@
 /* terminal.c -- How to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.4 1998/03/24 18:06:53 law Exp $
+   $Id: terminal.c,v 1.1.1.3 1998/03/24 18:20:18 law Exp $
 
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97, 98
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -141,7 +141,10 @@ terminal_begin_using_terminal ()
   if (!term_begin_use || !*term_begin_use)
     return;
 
+#ifdef SIGWINCH
   sigsave = signal (SIGWINCH, SIG_IGN); 
+#endif
+
   send_to_terminal (term_begin_use);
   /* Without this fflush and sleep, running info in a shelltool or
      cmdtool (TERM=sun-cmd) with scrollbars loses -- the scrollbars are
@@ -149,7 +152,10 @@ terminal_begin_using_terminal ()
      From: strube@physik3.gwdg.de (Hans Werner Strube).  */
   fflush (stdout);
   sleep (1);
+
+#ifdef SIGWINCH
   signal (SIGWINCH, sigsave);
+#endif
 }
 
 /* Tell the terminal that we will not be doing any more cursor
@@ -165,11 +171,17 @@ terminal_end_using_terminal ()
   if (!term_end_use || !*term_end_use)
     return;
 
+#ifdef SIGWINCH
   sigsave = signal (SIGWINCH, SIG_IGN);
+#endif
+
   send_to_terminal (term_end_use);
   fflush (stdout);
   sleep (1);
+
+#ifdef SIGWINCH
   signal (SIGWINCH, sigsave);
+#endif
 }
 
 /* **************************************************************** */
diff --git a/texinfo/info/tilde.c b/texinfo/info/tilde.c
index 46c3a5a448c..5013eae1861 100644
--- a/texinfo/info/tilde.c
+++ b/texinfo/info/tilde.c
@@ -1,10 +1,11 @@
 /* tilde.c -- Tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.2 1998/03/24 18:06:55 law Exp $
+   $Id: tilde.c,v 1.1.1.3 1998/03/24 18:20:19 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 96 Free Software Foundation, Inc.
+   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 98
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,22 +23,26 @@
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
+/* Indent #pragma so that older Cpp's don't try to parse it. */
+#ifdef _AIX
+ #pragma alloca
+#endif /* _AIX */
+
 /* Include config.h before doing alloca.  */
 #include "info.h"
 
-#ifndef alloca
-#if defined (__GNUC__)
-#  define alloca __builtin_alloca
-#else /* !__GNUC__ */
-#  if defined (_AIX)
- #pragma alloca
-#  else /* !_AIX */
-#    if defined (HAVE_ALLOCA_H)
-#      include <alloca.h>
-#    endif /* HAVE_ALLOCA_H */
-#  endif /* !AIX */
-#endif /* !__GNUC__ */
-#endif /* ! defined alloca */
+#ifdef __GNUC__
+# undef alloca
+# define alloca __builtin_alloca
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifndef _AIX
+char *alloca ();
+#  endif
+# endif
+#endif
 
 #if defined (TEST) || defined (STATIC_MALLOC)
 static void *xmalloc (), *xrealloc ();
diff --git a/texinfo/info/window.c b/texinfo/info/window.c
index 4357e656b87..6f7b68aa21f 100644
--- a/texinfo/info/window.c
+++ b/texinfo/info/window.c
@@ -1,5 +1,5 @@
 /* window.c -- Windows in Info.
-   $Id: window.c,v 1.2 1998/03/24 18:06:59 law Exp $
+   $Id: window.c,v 1.1.1.3 1998/03/24 18:20:20 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
@@ -723,7 +723,7 @@ character_width (character, hpos)
   int width = 1;
 
   if (ISO_Latin_p)
-    printable_limit = 160;
+    printable_limit = 255;
 
   if (character > printable_limit)
     width = 3;