--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/Makefile.in	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,211 @@
+# Makefile for texinfo/info.	-*- Indented-Text -*-
+# Copyright (C) 1993 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+#### Start of system configuration section. ####
+
+srcdir = @srcdir@
+VPATH  = $(srcdir):$(common)
+
+common = $(srcdir)/../libtxi
+
+CC = @CC@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+
+LN	= ln
+RM	= rm -f
+TAR	= tar
+MKDIR	= mkdir
+MAKEINFO= ../makeinfo/makeinfo
+COMPRESS= compress
+
+DEFS = @DEFS@
+
+LDEFS = -DNAMED_FUNCTIONS=1 -DDEFAULT_INFOPATH='"$(DEFAULT_INFOPATH)"'
+
+TERMLIBS = @TERMLIBS@
+LIBS = $(TERMLIBS) -L../libtxi -ltxi @LIBS@
+LOADLIBES = $(LIBS)
+
+SHELL = /bin/sh
+
+CFLAGS = -g
+LDFLAGS = -g
+
+prefix = /usr/local
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+# Prefix for each installed program, normally empty or `g'.
+binprefix = 
+libdir = $(prefix)/lib
+# Prefix for each installed man page, normally empty or `g'.
+manprefix = 
+mandir = $(prefix)/man/man1
+manext = 1
+infodir = $(prefix)/info
+
+#### End of system configuration section. ####
+
+SRCS =	dir.c		display.c	echo_area.c	filesys.c \
+	info-utils.c	info.c		infodoc.c	infomap.c \
+	m-x.c		nodes.c		search.c	session.c \
+	signals.c	terminal.c	tilde.c		window.c \
+	xmalloc.c	indices.c	makedoc.c	nodemenu.c \
+	footnotes.c	dribble.c	variables.c	gc.c
+
+HDRS =	display.h	doc.h		echo_area.h	filesys.h \
+	general.h	getopt.h	info-utils.h	info.h \
+	infomap.h	nodes.h		search.h 	session.h \
+	signals.h	termdep.h	terminal.h	tilde.h \
+	indices.h	window.h	footnotes.h	dribble.h \
+	variables.h	gc.h
+
+OBJS =	dir.o display.o doc.o echo_area.o filesys.o info-utils.o info.o \
+	infodoc.o infomap.o m-x.o nodes.o search.o session.o signals.o \
+	terminal.o tilde.o window.o indices.o xmalloc.o nodemenu.o \
+	footnotes.o dribble.o variables.o gc.o 
+
+# The names of files which declare info commands.
+CMDFILES = $(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
+
+# The name of the program which builds documentation structure from CMDFILES.
+MAKEDOC_OBJECTS = makedoc.o xmalloc.o
+MAKEDOC_SOURCE = makedoc.c xmalloc.c
+
+.c.o:
+	$(CC) -c $(CPPFLAGS) $(LDEFS) $(DEFS) -I. -I$(srcdir) -I$(common) $(CFLAGS) $<
+
+all: info info.info info-stnd.info
+sub-all: all
+
+install: all
+	$(INSTALL_PROGRAM) info $(bindir)/info
+	-d=$(srcdir); test -f ./info.info && d=.; $(INSTALL_DATA) $$d/info.info $(infodir)/info.info
+	-d=$(srcdir); test -f ./info-stnd.info && d=.; $(INSTALL_DATA) $$d/info-stnd.info $(infodir)/info-stnd.info
+	-$(INSTALL_DATA) $(srcdir)/info.1 $(mandir)/info.$(manext)
+
+uninstall:
+	rm -f $(bindir)/info
+	rm -f $(infodir)/info.info
+	rm -f $(infodir)/info-stnd.info
+	rm -f $(mandir)/info.$(manext)
+
+info: $(OBJS) ../libtxi/libtxi.a
+	$(CC) $(LDFLAGS) -o info $(OBJS) $(LOADLIBES)
+
+info.info: info.texi
+	$(MAKEINFO) --no-split -I$(srcdir) info.texi
+
+info-stnd.info: info-stnd.texi
+	$(MAKEINFO) --no-split -I$(srcdir) info-stnd.texi
+
+makedoc: $(MAKEDOC_OBJECTS) ../libtxi/libtxi.a
+	$(CC) $(LDFLAGS) -o makedoc $(MAKEDOC_OBJECTS) $(LOADLIBES)
+
+Makefile: $(srcdir)/Makefile.in ../config.status
+	cd ..; sh config.status
+
+clean:
+	rm -f info funs.h doc.c makedoc $(OBJS) $(MAKEDOC_OBJECTS)
+
+distclean: clean texclean
+	rm -f Makefile config.status *~ core core.* *.BAK TAGS
+
+mostlyclean: clean
+
+realclean: distclean
+	rm -f funs.h doc.c
+	rm -f info.info info-stnd.info
+
+TAGS: $(SRCS) makedoc-TAGS
+	etags $(SRCS)
+	cat makedoc-TAGS >>TAGS && rm -f makedoc-TAGS
+
+makedoc-TAGS: $(CMDFILES)
+	./makedoc -tags $(CMDFILES) >makedoc-TAGS
+
+texclean:
+	rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.cps \
+	*.tps *.fns *.kys *.pgs *.vrs
+
+check: info
+
+# 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.
+funs.h: makedoc $(CMDFILES)
+	-@if test -f funs.h; then mv -f funs.h old-funs.h; fi; :
+	-@if test -f doc.c; then mv -f doc.c old-doc.c; fi; :
+	./makedoc $(CMDFILES)
+	-@if cmp -s old-funs.h funs.h; then mv old-funs.h funs.h; \
+	  else rm -f old-funs.h; fi; :
+	-@if cmp -s old-doc.c doc.c; then mv old-doc.c doc.c; \
+	  else rm -f old-doc.c; fi; :
+
+doc.c: 		funs.h
+dribble.o:	dribble.c dribble.h
+display.o:	display.c
+echo_area.o:	echo_area.c
+filesys.o:	filesys.c
+info-utils.o:	info-utils.c
+info.o:		info.c
+infodoc.o:	infodoc.c
+infomap.o:	infomap.c
+m-x.o:		m-x.c
+nodes.o:	nodes.c
+search.o:	search.c
+session.o:	session.c
+signals.o:	signals.c
+terminal.o:	terminal.c
+tilde.o:	tilde.c
+window.o:	window.c
+xmalloc.o:	xmalloc.c
+indices.o:	indices.c
+makedoc.o:	makedoc.c
+
+dir.o: 		dir.c
+display.o: 	nodes.h info-utils.h search.h
+display.o: 	terminal.h window.h display.h
+echo_area.o: 	info.h
+filesys.o: 	general.h tilde.h filesys.h
+footnotes.o: 	footnotes.h
+info-utils.o: 	info-utils.h nodes.h search.h
+info.o: 	info.h $(common)/getopt.h
+infodoc.o: 	info.h doc.h
+infomap.o: 	infomap.h funs.h
+gc.o:		info.h
+m-x.o: 		info.h
+nodes.o: 	search.h filesys.h
+nodes.o: 	nodes.h info-utils.h
+search.o: 	general.h search.h nodes.h
+session.o: 	info.h
+signals.o: 	info.h signals.h
+terminal.o: 	terminal.h termdep.h
+tilde.o: 	tilde.h
+variables.c: 	variables.h
+window.o: 	nodes.h window.h display.h
+window.o: 	info-utils.h search.h infomap.h
+
+# Prevent GNU make v3 from overflowing arg limit on SysV.
+.NOEXPORT:
+
+# eof

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/dir.c	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,224 @@
+/* dir.c -- How to build a special "dir" node from "localdir" files. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <sys/errno.h>
+#include "info-utils.h"
+#include "filesys.h"
+#include "tilde.h"
+
+/* The "dir" node can be built from the contents of a file called "dir",
+   with the addition of the menus of every file called "localdir" found in
+   INFOPATH. */
+
+static void add_menu_to_file_buffer (), insert_text_into_fb_at_binding ();
+
+void
+maybe_build_dir_node (dirname, from_files_named)
+     char *dirname;
+     char *from_files_named;
+{
+  FILE_BUFFER *dir_buffer;
+
+  /* See if the file has already been loaded and exists. */
+  dir_buffer = info_find_file (dirname);
+
+  /* If there is no "dir" in the current info path, we cannot build one
+     from nothing. */
+  if (!dir_buffer)
+    return;
+
+  /* If this directory has already been built, return now. */
+  if (dir_buffer->flags & N_CannotGC)
+    return;
+
+  dir_buffer->flags |= N_CannotGC;
+
+  /* For every file named FROM_FILES_NAMED in the search path, add the
+     contents of that file's menu to our "dir" node. */
+  {
+    struct stat finfo;
+    char *this_dir;
+    int namelen, path_index;
+    int update_tags = 0;
+
+    namelen = strlen (from_files_named);
+    path_index = 0;
+
+    /* Using each element of the path, check for "localdir".  Do not check
+       for "localdir.info.Z" or anything else.  Only files explictly named
+       "localdir" are eligible.  This is a design decision.  There can be
+       an info file name "localdir.info" which contains information on the
+       setting up of "localdir" files. */
+    while (this_dir = extract_colon_unit (infopath, &path_index))
+      {
+	char *fullpath;
+	int statable;
+
+	/* Expand a leading tilde if one is present. */
+	if (*this_dir == '~')
+	  {
+	    char *tilde_expanded_dirname;
+
+	    tilde_expanded_dirname = tilde_expand_word (this_dir);
+	    free (this_dir);
+	    this_dir = tilde_expanded_dirname;
+	  }
+
+	fullpath = (char *)xmalloc (3 + strlen (this_dir) + namelen);
+	strcpy (fullpath, this_dir);
+	if (fullpath[strlen (fullpath) - 1] != '/')
+	  strcat (fullpath, "/");
+	strcat (fullpath, from_files_named);
+
+	statable = (stat (fullpath, &finfo) == 0);
+
+	if (statable && S_ISREG (finfo.st_mode))
+	  {
+	    long filesize;
+	    char *contents;
+
+	    contents = filesys_read_info_file (fullpath, &filesize, &finfo);
+
+	    if (contents)
+	      {
+		update_tags++;
+		add_menu_to_file_buffer (contents, filesize, dir_buffer);
+		free (contents);
+	      }
+	  }
+
+	free (fullpath);
+	free (this_dir);
+      }
+    if (update_tags)
+      build_tags_and_nodes (dir_buffer);
+  }
+}
+
+/* Given CONTENTS and FB (a file buffer), add the menu found in CONTENTS
+   to the menu found in FB->contents.  Second argument SIZE is the total
+   size of CONTENTS. */
+static void
+add_menu_to_file_buffer (contents, size, fb)
+     char *contents;
+     long size;
+     FILE_BUFFER *fb;
+{
+  SEARCH_BINDING contents_binding, fb_binding;
+  long contents_offset, fb_offset;
+
+  contents_binding.buffer = contents;
+  contents_binding.start = 0;
+  contents_binding.end = size;
+  contents_binding.flags = S_FoldCase | S_SkipDest;
+
+  fb_binding.buffer = fb->contents;
+  fb_binding.start = 0;
+  fb_binding.end = fb->filesize;
+  fb_binding.flags = S_FoldCase | S_SkipDest;
+
+  /* Move to the start of the menus in CONTENTS and FB. */
+  contents_offset = search_forward (INFO_MENU_LABEL, &contents_binding);
+  fb_offset = search_forward (INFO_MENU_LABEL, &fb_binding);
+
+  /* If there is no menu in CONTENTS, quit now. */
+  if (contents_offset == -1)
+    return;
+
+  /* If there is no menu in FB, make one. */
+  if (fb_offset == -1)
+    {
+      /* Find the start of the second node in this file buffer.  If there
+	 is only one node, we will be adding the contents to the end of
+	 this node. */
+      fb_offset = find_node_separator (&fb_binding);
+
+      /* If not even a single node separator, give up. */
+      if (fb_offset == -1)
+	return;
+
+      fb_binding.start = fb_offset;
+      fb_binding.start +=
+	skip_node_separator (fb_binding.buffer + fb_binding.start);
+
+      /* Try to find the next node separator. */
+      fb_offset = find_node_separator (&fb_binding);
+
+      /* If found one, consider that the start of the menu.  Otherwise, the
+	 start of this menu is the end of the file buffer (i.e., fb->size). */
+      if (fb_offset != -1)
+	fb_binding.start = fb_offset;
+      else
+	fb_binding.start = fb_binding.end;
+
+      insert_text_into_fb_at_binding
+	(fb, &fb_binding, INFO_MENU_LABEL, strlen (INFO_MENU_LABEL));
+
+      fb_binding.buffer = fb->contents;
+      fb_binding.start = 0;
+      fb_binding.end = fb->filesize;
+      fb_offset = search_forward (INFO_MENU_LABEL, &fb_binding);
+      if (fb_offset == -1)
+	abort ();
+    }
+
+  /* CONTENTS_OFFSET and FB_OFFSET point to the starts of the menus that
+     appear in their respective buffers.  Add the remainder of CONTENTS
+     to the end of FB's menu. */
+  fb_binding.start = fb_offset;
+  fb_offset = find_node_separator (&fb_binding);
+  if (fb_offset != -1)
+    fb_binding.start = fb_offset;
+  else
+    fb_binding.start = fb_binding.end;
+
+  insert_text_into_fb_at_binding
+    (fb, &fb_binding, contents + contents_offset, size - contents_offset);
+}
+
+static void
+insert_text_into_fb_at_binding (fb, binding, text, textlen)
+     FILE_BUFFER *fb;
+     SEARCH_BINDING *binding;
+     char *text;
+     int textlen;
+{
+  char *contents;
+  long start, end;
+
+  start = binding->start;
+  end = fb->filesize;
+
+  contents = (char *)xmalloc (fb->filesize + textlen + 1);
+  memcpy (contents, fb->contents, start);
+  memcpy (contents + start, text, textlen);
+  memcpy (contents + start + textlen, fb->contents + start, end - start);
+  free (fb->contents);
+  fb->contents = contents;
+  fb->filesize += textlen;
+  fb->finfo.st_size = fb->filesize;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/display.c	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,561 @@
+/* display.c -- How to display Info windows. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "display.h"
+
+extern int info_any_buffered_input_p (); /* Found in session.c. */
+
+static void free_display ();
+static DISPLAY_LINE **make_display ();
+
+/* An array of display lines which tell us what is currently visible on
+   the display.  */
+DISPLAY_LINE **the_display = (DISPLAY_LINE **)NULL;
+
+/* Non-zero means do no output. */
+int display_inhibited = 0;
+
+/* Initialize THE_DISPLAY to WIDTH and HEIGHT, with nothing in it. */
+void
+display_initialize_display (width, height)
+     int width, height;
+{
+  free_display (the_display);
+  the_display = make_display (width, height);
+  display_clear_display (the_display);
+}
+
+/* Clear all of the lines in DISPLAY making the screen blank. */
+void
+display_clear_display (display)
+     DISPLAY_LINE **display;
+{
+  register int i;
+  register DISPLAY_LINE *display_line;
+
+  for (i = 0; display_line = display[i]; i++)
+    {
+      display[i]->text[0] = '\0';
+      display[i]->textlen = 0;
+      display[i]->inverse = 0;
+    }
+}
+
+/* Non-zero if we didn't completely redisplay a window. */
+int display_was_interrupted_p = 0;
+
+/* Update the windows pointed to by WINDOW in the_display.  This actually
+   writes the text on the screen. */
+void
+display_update_display (window)
+     WINDOW *window;
+{
+  register WINDOW *win;
+
+  display_was_interrupted_p = 0;
+
+  /* For every window in the list, check contents against the display. */
+  for (win = window; win; win = win->next)
+    {
+      /* Only re-display visible windows which need updating. */
+      if (((win->flags & W_WindowVisible) == 0) ||
+	  ((win->flags & W_UpdateWindow) == 0) ||
+	  (win->height == 0))
+	continue;
+
+      display_update_one_window (win);
+      if (display_was_interrupted_p)
+	break;
+    }
+
+  /* Always update the echo area. */
+  display_update_one_window (the_echo_area);
+}
+
+/* Display WIN on the_display.  Unlike display_update_display (), this
+   function only does one window. */
+void
+display_update_one_window (win)
+     WINDOW *win;
+{
+  register char *nodetext;	/* Current character to display. */
+  register char *last_node_char; /* Position of the last character in node. */
+  register int i;		/* General use index. */
+  char *printed_line;		/* Buffer for a printed line. */
+  int pl_index = 0;		/* Index into PRINTED_LINE. */
+  int line_index = 0;		/* Number of lines done so far. */
+  DISPLAY_LINE **display = the_display;
+
+  /* If display is inhibited, that counts as an interrupted display. */
+  if (display_inhibited)
+    display_was_interrupted_p = 1;
+
+  /* If the window has no height, or display is inhibited, quit now. */
+  if (!win->height || display_inhibited)
+    return;
+
+  /* If the window's first row doesn't appear in the_screen, then it
+     cannot be displayed.  This can happen when the_echo_area is the
+     window to be displayed, and the screen has shrunk to less than one
+     line. */
+  if ((win->first_row < 0) || (win->first_row > the_screen->height))
+    return;
+
+  /* Print each line in the window into our local buffer, and then
+     check the contents of that buffer against the display.  If they
+     differ, update the display. */
+  printed_line = (char *)xmalloc (1 + win->width);
+
+  if (!win->node || !win->line_starts)
+    goto done_with_node_display;
+
+  nodetext = win->line_starts[win->pagetop];
+  last_node_char = win->node->contents + win->node->nodelen;
+
+  for (; nodetext < last_node_char; nodetext++)
+    {
+      char *rep, *rep_carried_over, rep_temp[2];
+      int replen;
+
+      if (isprint (*nodetext))
+	{
+	  rep_temp[0] = *nodetext;
+	  replen = 1;
+	  rep_temp[1] = '\0';
+	  rep = rep_temp;
+	}
+      else
+	{
+	  if (*nodetext == '\r' || *nodetext == '\n')
+	    {
+	      replen = win->width - pl_index;
+	    }
+	  else
+	    {
+	      rep = printed_representation (*nodetext, pl_index);
+	      replen = strlen (rep);
+	    }
+	}
+
+      /* If this character can be printed without passing the width of
+	 the line, then stuff it into the line. */
+      if (replen + pl_index < win->width)
+	{
+	  /* Optimize if possible. */
+	  if (replen == 1)
+	    {
+	      printed_line[pl_index++] = *rep;
+	    }
+	  else
+	    {
+	      for (i = 0; i < replen; i++)
+		printed_line[pl_index++] = rep[i];
+	    }
+	}
+      else
+	{
+	  DISPLAY_LINE *entry;
+
+	  /* If this character cannot be printed in this line, we have
+	     found the end of this line as it would appear on the screen.
+	     Carefully print the end of the line, and then compare. */
+	  if (*nodetext == '\n' || *nodetext == '\r' || *nodetext == '\t')
+	    {
+	      printed_line[pl_index] = '\0';
+	      rep_carried_over = (char *)NULL;
+	    }
+	  else
+	    {
+	      /* The printed representation of this character extends into
+		 the next line.  Remember the offset of the last character
+		 printed out of REP so that we can carry the character over
+		 to the next line. */
+	      for (i = 0; pl_index < (win->width - 1);)
+		printed_line[pl_index++] = rep[i++];
+	      
+	      rep_carried_over = rep + i;
+
+	      /* If printing the last character in this window couldn't
+		 possibly cause the screen to scroll, place a backslash
+		 in the rightmost column. */
+	      if (1 + line_index + win->first_row < the_screen->height)
+		{
+		  if (win->flags & W_NoWrap)
+		    printed_line[pl_index++] = '$';
+		  else
+		    printed_line[pl_index++] = '\\';
+		}
+	      printed_line[pl_index] = '\0';
+	    }
+
+	  /* We have the exact line as it should appear on the screen.
+	     Check to see if this line matches the one already appearing
+	     on the screen. */
+	  entry = display[line_index + win->first_row];
+
+	  /* If the screen line is inversed, then we have to clear
+	     the line from the screen first.  Why, I don't know. */
+	  if (entry->inverse)
+	    {
+	      terminal_goto_xy (0, line_index + win->first_row);
+	      terminal_clear_to_eol ();
+	      entry->inverse = 0;
+	      entry->text[0] = '\0';
+	      entry->textlen = 0;
+	    }
+
+	  /* Find the offset where these lines differ. */
+	  for (i = 0; i < pl_index; i++)
+	    if (printed_line[i] != entry->text[i])
+	      break;
+
+	  /* If the lines are not the same length, or if they differed
+	     at all, we must do some redrawing. */
+	  if ((i != pl_index) || (pl_index != entry->textlen))
+	    {
+	      /* Move to the proper point on the terminal. */
+	      terminal_goto_xy (i, line_index + win->first_row);
+
+	      /* If there is any text to print, print it. */
+	      if (i != pl_index)
+		terminal_put_text (printed_line + i);
+
+	      /* If the printed text didn't extend all the way to the edge
+		 of the window, and text was appearing between here and the
+		 edge of the window, clear from here to the end of the line. */
+	      if ((pl_index < win->width && pl_index < entry->textlen) ||
+		  (entry->inverse))
+		terminal_clear_to_eol ();
+
+	      fflush (stdout);
+
+	      /* Update the display text buffer. */
+	      strcpy (entry->text + i, printed_line + i);
+	      entry->textlen = pl_index;
+
+	      /* Lines showing node text are not in inverse.  Only modelines
+		 have that distinction. */
+	      entry->inverse = 0;
+	    }
+
+	  /* We have done at least one line.  Increment our screen line
+	     index, and check against the bottom of the window. */
+	  if (++line_index == win->height)
+	    break;
+
+	  /* A line has been displayed, and the screen reflects that state.
+	     If there is typeahead pending, then let that typeahead be read
+	     now, instead of continuing with the display. */
+	  if (info_any_buffered_input_p ())
+	    {
+	      free (printed_line);
+	      display_was_interrupted_p = 1;
+	      return;
+	    }
+
+	  /* Reset PL_INDEX to the start of the line. */
+	  pl_index = 0;
+
+	  /* If there are characters from REP left to print, stuff them
+	     into the buffer now. */
+	  if (rep_carried_over)
+	    for (; rep[pl_index]; pl_index++)
+	      printed_line[pl_index] = rep[pl_index];
+
+	  /* If this window has chosen not to wrap lines, skip to the end
+	     of the physical line in the buffer, and start a new line here. */
+	  if (pl_index && (win->flags & W_NoWrap))
+	    {
+	      char *begin;
+
+	      pl_index = 0;
+	      printed_line[0] = '\0';
+
+	      begin = nodetext;
+	      
+	      while ((nodetext < last_node_char) && (*nodetext != '\n'))
+		nodetext++;
+	    }
+	}
+    }
+
+ done_with_node_display:
+  /* We have reached the end of the node or the end of the window.  If it
+     is the end of the node, then clear the lines of the window from here
+     to the end of the window. */
+  for (; line_index < win->height; line_index++)
+    {
+      DISPLAY_LINE *entry = display[line_index + win->first_row];
+
+      /* If this line has text on it then make it go away. */
+      if (entry && entry->textlen)
+	{
+	  entry->textlen = 0;
+	  entry->text[0] = '\0';
+
+	  terminal_goto_xy (0, line_index + win->first_row);
+	  terminal_clear_to_eol ();
+	}
+    }
+
+  /* Finally, if this window has a modeline it might need to be redisplayed.
+     Check the window's modeline against the one in the display, and update
+     if necessary. */
+  if ((win->flags & W_InhibitMode) == 0)
+    {
+      window_make_modeline (win);
+      line_index = win->first_row + win->height;
+
+      /* This display line must both be in inverse, and have the same
+	 contents. */
+      if ((!display[line_index]->inverse) ||
+	  (strcmp (display[line_index]->text, win->modeline) != 0))
+	{
+	  terminal_goto_xy (0, line_index);
+	  terminal_begin_inverse ();
+	  terminal_put_text (win->modeline);
+	  terminal_end_inverse ();
+	  strcpy (display[line_index]->text, win->modeline);
+	  display[line_index]->inverse = 1;
+	  display[line_index]->textlen = strlen (win->modeline);
+	  fflush (stdout);
+	}
+    }
+
+  /* Okay, this window doesn't need updating anymore. */
+  win->flags &= ~W_UpdateWindow;
+  free (printed_line);
+  fflush (stdout);
+}
+
+/* Scroll the region of the_display starting at START, ending at END, and
+   moving the lines AMOUNT lines.  If AMOUNT is less than zero, the lines
+   are moved up in the screen, otherwise down.  Actually, it is possible
+   for no scrolling to take place in the case that the terminal doesn't
+   support it.  This doesn't matter to us. */
+void
+display_scroll_display (start, end, amount)
+     int start, end, amount;
+{
+  register int i, last;
+  DISPLAY_LINE *temp;
+
+  /* If this terminal cannot do scrolling, give up now. */
+  if (!terminal_can_scroll)
+    return;
+
+  /* If there isn't anything displayed on the screen because it is too
+     small, quit now. */
+  if (!the_display[0])
+    return;
+
+  /* If there is typeahead pending, then don't actually do any scrolling. */
+  if (info_any_buffered_input_p ())
+    return;
+
+  /* Do it on the screen. */
+  terminal_scroll_terminal (start, end, amount);
+
+  /* Now do it in the display buffer so our contents match the screen. */
+  if (amount > 0)
+    {
+      last = end + amount;
+
+      /* Shift the lines to scroll right into place. */
+      for (i = 0; i < (end - start); i++)
+	{
+	  temp = the_display[last - i];
+	  the_display[last - i] = the_display[end - i];
+	  the_display[end - i] = temp;
+	}
+
+      /* The lines have been shifted down in the buffer.  Clear all of the
+	 lines that were vacated. */
+      for (i = start; i != (start + amount); i++)
+	{
+	  the_display[i]->text[0] = '\0';
+	  the_display[i]->textlen = 0;
+	  the_display[i]->inverse = 0;
+	}
+    }
+
+  if (amount < 0)
+    {
+      last = start + amount;
+      for (i = 0; i < (end - start); i++)
+	{
+	  temp = the_display[last + i];
+	  the_display[last + i] = the_display[start + i];
+	  the_display[start + i] = temp;
+	}
+
+      /* The lines have been shifted up in the buffer.  Clear all of the
+	 lines that are left over. */
+      for (i = end + amount; i != end; i++)
+	{
+	  the_display[i]->text[0] = '\0';
+	  the_display[i]->textlen = 0;
+	  the_display[i]->inverse = 0;
+	}
+    }
+}
+
+/* Try to scroll lines in WINDOW.  OLD_PAGETOP is the pagetop of WINDOW before
+   having had its line starts recalculated.  OLD_STARTS is the list of line
+   starts that used to appear in this window.  OLD_COUNT is the number of lines
+   that appear in the OLD_STARTS array. */
+void
+display_scroll_line_starts (window, old_pagetop, old_starts, old_count)
+     WINDOW *window;
+     int old_pagetop, old_count;
+     char **old_starts;
+{
+  register int i, old, new;	/* Indices into the line starts arrays. */
+  int last_new, last_old;	/* Index of the last visible line. */
+  int old_first, new_first;	/* Index of the first changed line. */
+  int unchanged_at_top = 0;
+  int already_scrolled = 0;
+
+  /* Locate the first line which was displayed on the old window. */
+  old_first = old_pagetop;
+  new_first = window->pagetop;
+
+  /* Find the last line currently visible in this window. */
+  last_new = window->pagetop + (window->height - 1);
+  if (last_new > window->line_count)
+    last_new = window->line_count - 1;
+
+  /* Find the last line which used to be currently visible in this window. */
+  last_old = old_pagetop + (window->height - 1);
+  if (last_old > old_count)
+    last_old = old_count - 1;
+
+  for (old = old_first, new = new_first;
+       old < last_old && new < last_new;
+       old++, new++)
+    if (old_starts[old] != window->line_starts[new])
+      break;
+    else
+      unchanged_at_top++;
+
+  /* Loop through the old lines looking for a match in the new lines. */
+  for (old = old_first + unchanged_at_top; old < last_old; old++)
+    {
+      for (new = new_first; new < last_new; new++)
+	if (old_starts[old] == window->line_starts[new])
+	  {
+	    /* Find the extent of the matching lines. */
+	    for (i = 0; (old + i) < last_old; i++)
+	      if (old_starts[old + i] != window->line_starts[new + i])
+		break;
+
+	    /* Scroll these lines if there are enough of them. */
+	    {
+	      int start, end, amount;
+
+	      start = (window->first_row
+		       + ((old + already_scrolled) - old_pagetop));
+	      amount = new - (old + already_scrolled);
+	      end = window->first_row + window->height;
+
+	      /* If we are shifting the block of lines down, then the last
+		 AMOUNT lines will become invisible.  Thus, don't bother
+		 scrolling them. */
+	      if (amount > 0)
+		end -= amount;
+
+	      if ((end - start) > 0)
+		{
+		  display_scroll_display (start, end, amount);
+
+		  /* Some lines have been scrolled.  Simulate the scrolling
+		     by offsetting the value of the old index. */
+		  old += i;
+		  already_scrolled += amount;
+		}
+	    }
+	  }
+    }
+}
+
+/* Move the screen cursor to directly over the current character in WINDOW. */
+void
+display_cursor_at_point (window)
+     WINDOW *window;
+{
+  int vpos, hpos;
+
+  vpos = window_line_of_point (window) - window->pagetop + window->first_row;
+  hpos = window_get_cursor_column (window);
+  terminal_goto_xy (hpos, vpos);
+}
+
+/* **************************************************************** */
+/*								    */
+/*		     Functions Static to this File		    */
+/*								    */
+/* **************************************************************** */
+
+/* Make a DISPLAY_LINE ** with width and height. */
+static DISPLAY_LINE **
+make_display (width, height)
+     int width, height;
+{
+  register int i;
+  DISPLAY_LINE **display;
+
+  display = (DISPLAY_LINE **)xmalloc ((1 + height) * sizeof (DISPLAY_LINE *));
+
+  for (i = 0; i < height; i++)
+    {
+      display[i] = (DISPLAY_LINE *)xmalloc (sizeof (DISPLAY_LINE));
+      display[i]->text = (char *)xmalloc (1 + width);
+      display[i]->textlen = 0;
+      display[i]->inverse = 0;
+    }
+  display[i] = (DISPLAY_LINE *)NULL;
+  return (display);
+}
+
+/* Free the storage allocated to DISPLAY. */
+static void
+free_display (display)
+     DISPLAY_LINE **display;
+{
+  register int i;
+  register DISPLAY_LINE *display_line;
+
+  if (!display)
+    return;
+
+  for (i = 0; display_line = display[i]; i++)
+    {
+      free (display_line->text);
+      free (display_line);
+    }
+  free (display);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/display.h	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,76 @@
+/* display.h -- How the display in Info is done. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#if !defined (_DISPLAY_H_)
+#define _DISPLAY_H_
+
+#include "info-utils.h"
+#include "terminal.h"
+
+typedef struct {
+  char *text;			/* Text of the line as it appears. */
+  int textlen;			/* Printable Length of TEXT. */
+  int inverse;			/* Non-zero means this line is inverse. */
+} DISPLAY_LINE;
+
+/* An array of display lines which tell us what is currently visible on
+   the display.  */
+extern DISPLAY_LINE **the_display;
+
+/* Non-zero means do no output. */
+extern int display_inhibited;
+
+/* Non-zero if we didn't completely redisplay a window. */
+extern int display_was_interrupted_p;
+
+/* Initialize THE_DISPLAY to WIDTH and HEIGHT, with nothing in it. */
+extern void display_initialize_display ();
+
+/* Clear all of the lines in DISPLAY making the screen blank. */
+extern void display_clear_display ();
+
+/* Update the windows pointed to by WINDOWS in THE_DISPLAY.  This actually
+   writes the text on the screen. */
+extern void display_update_display ();
+
+/* Display WIN on THE_DISPLAY.  Unlike display_update_display (), this
+   function only does one window. */
+extern void display_update_one_window ();
+
+/* Move the screen cursor to directly over the current character in WINDOW. */
+extern void display_cursor_at_point ();
+
+/* Scroll the region of the_display starting at START, ending at END, and
+   moving the lines AMOUNT lines.  If AMOUNT is less than zero, the lines
+   are moved up in the screen, otherwise down.  Actually, it is possible
+   for no scrolling to take place in the case that the terminal doesn't
+   support it.  This doesn't matter to us. */
+extern void display_scroll_display ();
+
+/* Try to scroll lines in WINDOW.  OLD_PAGETOP is the pagetop of WINDOW before
+   having had its line starts recalculated.  OLD_STARTS is the list of line
+   starts that used to appear in this window.  OLD_COUNT is the number of lines
+   that appear in the OLD_STARTS array. */
+extern void display_scroll_line_starts ();
+
+#endif /* !_DISPLAY_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/doc.h	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,58 @@
+/* doc.h -- Structure associating function pointers with documentation. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#if !defined (_DOC_H_)
+#define _DOC_H_
+
+#if !defined (NULL)
+#  define NULL 0x0
+#endif /* !NULL */
+
+#if !defined (__FUNCTION_DEF)
+#  define __FUNCTION_DEF
+typedef int Function ();
+typedef void VFunction ();
+#endif /* _FUNCTION_DEF */
+
+typedef struct {
+  VFunction *func;
+#if defined (NAMED_FUNCTIONS)
+  char *func_name;
+#endif /* NAMED_FUNCTIONS */
+  char *doc;
+} FUNCTION_DOC;
+
+extern FUNCTION_DOC function_doc_array[];
+
+extern char *function_documentation ();
+extern char *key_documentation ();
+extern char *pretty_keyname ();
+extern char *replace_in_documentation ();
+extern void info_document_key ();
+extern void dump_map_to_message_buffer ();
+
+#if defined (NAMED_FUNCTIONS)
+extern char *function_name ();
+extern VFunction *named_function ();
+#endif /* NAMED_FUNCTIONS */
+#endif /* !_DOC_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/dribble.c	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,71 @@
+/* dribble.c -- Dribble files for Info. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#include <stdio.h>
+#include "dribble.h"
+
+/* When non-zero, it is a stream to write all input characters to for the
+   duration of this info session. */
+FILE *info_dribble_file = (FILE *)NULL;
+
+/* Open a dribble file named NAME, perhaps closing an already open one.
+   This sets the global variable INFO_DRIBBLE_FILE to the open stream. */
+void
+open_dribble_file (name)
+     char *name;
+{
+  /* Perhaps close existing dribble file. */
+  close_dribble_file ();
+
+  info_dribble_file = fopen (name, "w");
+
+#if defined (HAVE_SETVBUF)
+  if (info_dribble_file)
+#  if defined (SETVBUF_REVERSED)
+    setvbuf (info_dribble_file, _IONBF, (char *)NULL, 1);
+#  else
+    setvbuf (info_dribble_file, (char *)NULL, _IONBF, 1);
+#  endif /* !SETVBUF_REVERSED */
+#endif /* HAVE_SETVBUF */
+}
+
+/* If there is a dribble file already open, close it. */
+void
+close_dribble_file ()
+{
+  if (info_dribble_file)
+    {
+      fflush (info_dribble_file);
+      fclose (info_dribble_file);
+      info_dribble_file = (FILE *)NULL;
+    }
+}
+
+/* Write some output to our existing dribble file. */
+void
+dribble (byte)
+     unsigned char byte;
+{
+  if (info_dribble_file)
+    fwrite (&byte, sizeof (unsigned char), 1, info_dribble_file);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/dribble.h	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,41 @@
+/* dribble.h -- Functions and vars declared in dribble.c. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#if !defined (_DRIBBLE_H_)
+#define _DRIBBLE_H_
+
+/* When non-zero, it is a stream to write all input characters to for the
+   duration of this info session. */
+extern FILE *info_dribble_file;
+
+/* Open a dribble file named NAME, perhaps closing an already open one.
+   This sets the global variable INFO_DRIBBLE_FILE to the open stream. */
+extern void open_dribble_file ();
+
+/* If there is a dribble file already open, close it. */
+extern void close_dribble_file ();
+
+/* Write some output to our existing dribble file. */
+extern void dribble ();
+
+#endif /* !_DRIBBLE_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/echo_area.c	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,1500 @@
+/* echo_area.c -- How to read a line in the echo area. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#include "info.h"
+
+/* Non-zero means that C-g was used to quit reading input. */
+int info_aborted_echo_area = 0;
+
+/* Non-zero means that the echo area is being used to read input. */
+int echo_area_is_active = 0;
+
+/* The address of the last command executed in the echo area. */
+VFunction *ea_last_executed_command = (VFunction *)NULL;
+
+/* Non-zero means that the last command executed while reading input
+   killed some text. */
+int echo_area_last_command_was_kill = 0;
+
+/* Variables which hold on to the current state of the input line. */
+static char input_line[1 + EA_MAX_INPUT];
+static char *input_line_prompt;
+static int input_line_point;
+static int input_line_beg;
+static int input_line_end;
+static NODE input_line_node = {
+  (char *)NULL, (char *)NULL, (char *)NULL, input_line, EA_MAX_INPUT, 0
+};
+
+static void echo_area_initialize_node ();
+static void push_echo_area (), pop_echo_area ();
+static int echo_area_stack_depth (), echo_area_stack_contains_completions_p ();
+
+static void ea_kill_text ();
+
+/* Non-zero means we force the user to complete. */
+static int echo_area_must_complete_p = 0;
+static int completions_window_p ();
+
+/* If non-null, this is a window which was specifically created to display
+   possible completions output.  We remember it so we can delete it when
+   appropriate. */
+static WINDOW *echo_area_completions_window = (WINDOW *)NULL;
+
+/* Variables which keep track of the window which was active prior to
+   entering the echo area. */
+static WINDOW *calling_window = (WINDOW *)NULL;
+static NODE *calling_window_node = (NODE *)NULL;
+static long calling_window_point = 0;
+static long calling_window_pagetop = 0;
+
+/* Remember the node and pertinent variables of the calling window. */
+static void
+remember_calling_window (window)
+     WINDOW *window;
+{
+  /* Only do this if the calling window is not the completions window, or,
+     if it is the completions window and there is no other window. */
+  if (!completions_window_p (window) ||
+      ((window == windows) && !(window->next)))
+    {
+      calling_window = window;
+      calling_window_node = window->node;
+      calling_window_point = window->point;
+      calling_window_pagetop = window->pagetop;
+    }
+}
+
+/* Restore the caller's window so that it shows the node that it was showing
+   on entry to info_read_xxx_echo_area (). */
+static void
+restore_calling_window ()
+{
+  register WINDOW *win, *compwin = (WINDOW *)NULL;
+
+  /* If the calling window is still visible, and it is the window that
+     we used for completions output, then restore the calling window. */
+  for (win = windows; win; win = win->next)
+    {
+      if (completions_window_p (win))
+	compwin = win;
+
+      if (win == calling_window && win == compwin)
+	{
+	  window_set_node_of_window (calling_window, calling_window_node);
+	  calling_window->point = calling_window_point;
+	  calling_window->pagetop = calling_window_pagetop;
+	  compwin = (WINDOW *)NULL;
+	  break;
+	}
+    }
+
+  /* Delete the completions window if it is still present, it isn't the
+     last window on the screen, and there aren't any prior echo area reads
+     pending which created a completions window. */
+  if (compwin)
+    {
+      if ((compwin != windows || windows->next) &&
+	  !echo_area_stack_contains_completions_p ())
+	{
+	  WINDOW *next;
+	  int pagetop, start, end, amount;
+
+	  next = compwin->next;
+	  if (next)
+	    {
+	      start = next->first_row;
+	      end = start + next->height;
+	      amount = - (compwin->height + 1);
+	      pagetop = next->pagetop;
+	    }
+
+	  info_delete_window_internal (compwin);
+
+	  /* This is not necessary because info_delete_window_internal ()
+	     calls echo_area_inform_of_deleted_window (), which does the
+	     right thing. */
+#if defined (UNNECESSARY)
+	  echo_area_completions_window = (WINDOW *)NULL;
+#endif /* UNNECESSARY */
+
+	  if (next)
+	    {
+	      display_scroll_display (start, end, amount);
+	      next->pagetop = pagetop;
+	      display_update_display (windows);
+	    }
+	}
+    }
+}
+
+/* Set up a new input line with PROMPT. */
+static void
+initialize_input_line (prompt)
+     char *prompt;
+{
+  input_line_prompt = prompt;
+  if (prompt)
+    strcpy (input_line, prompt);
+  else
+    input_line[0] = '\0';
+
+  input_line_beg = input_line_end = input_line_point = strlen (prompt);
+}
+
+static char *
+echo_area_after_read ()
+{
+  char *return_value;
+
+  if (info_aborted_echo_area)
+    {
+      info_aborted_echo_area = 0;
+      return_value = (char *)NULL;
+    }
+  else
+    {
+      if (input_line_beg == input_line_end)
+	return_value = savestring ("");
+      else
+	{
+	  int line_len = input_line_end - input_line_beg;
+	  return_value = (char *) xmalloc (1 + line_len);
+	  strncpy (return_value, &input_line[input_line_beg], line_len);
+	  return_value[line_len] = '\0';
+	}
+    }
+  return (return_value);
+}
+
+/* Read a line of text in the echo area.  Return a malloc ()'ed string,
+   or NULL if the user aborted out of this read.  WINDOW is the currently
+   active window, so that we can restore it when we need to.  PROMPT, if
+   non-null, is a prompt to print before reading the line. */
+char *
+info_read_in_echo_area (window, prompt)
+     WINDOW *window;
+     char *prompt;
+{
+  char *line;
+
+  /* If the echo area is already active, remember the current state. */
+  if (echo_area_is_active)
+    push_echo_area ();
+
+  /* Initialize our local variables. */
+  initialize_input_line (prompt);
+
+  /* Initialize the echo area for the first (but maybe not the last) time. */
+  echo_area_initialize_node ();
+
+  /* Save away the original node of this window, and the window itself,
+     so echo area commands can temporarily use this window. */
+  remember_calling_window (window);
+
+  /* Let the rest of Info know that the echo area is active. */
+  echo_area_is_active++;
+  active_window = the_echo_area;
+
+  /* Read characters in the echo area. */
+  info_read_and_dispatch ();
+
+  echo_area_is_active--;
+
+  /* Restore the original active window and show point in it. */
+  active_window = calling_window;
+  restore_calling_window ();
+  display_cursor_at_point (active_window);
+  fflush (stdout);
+
+  /* Get the value of the line. */
+  line = echo_area_after_read ();
+
+  /* If there is a previous loop waiting for us, restore it now. */
+  if (echo_area_is_active)
+    pop_echo_area ();
+
+  /* Return the results to the caller. */
+  return (line);
+}
+
+/* (re) Initialize the echo area node. */
+static void
+echo_area_initialize_node ()
+{
+  register int i;
+
+  for (i = input_line_end; i < sizeof (input_line); i++)
+    input_line[i] = ' ';
+
+  input_line[i - 1] = '\n';
+  window_set_node_of_window (the_echo_area, &input_line_node);
+  input_line[input_line_end] = '\n';
+}
+
+/* Prepare to read characters in the echo area.  This can initialize the
+   echo area node, but its primary purpose is to side effect the input
+   line buffer contents. */
+void
+echo_area_prep_read ()
+{
+  if (the_echo_area->node != &input_line_node)
+    echo_area_initialize_node ();
+
+  the_echo_area->point = input_line_point;
+  input_line[input_line_end] = '\n';
+  display_update_one_window (the_echo_area);
+  display_cursor_at_point (active_window);
+}
+
+
+/* **************************************************************** */
+/*								    */
+/*		     Echo Area Movement Commands		    */
+/*								    */
+/* **************************************************************** */
+
+DECLARE_INFO_COMMAND (ea_forward, "Move forward a character")
+{
+  if (count < 0)
+    ea_backward (window, -count, key);
+  else
+    {
+      input_line_point += count;
+      if (input_line_point > input_line_end)
+	input_line_point = input_line_end;
+    }
+}
+
+DECLARE_INFO_COMMAND (ea_backward, "Move backward a character")
+{
+  if (count < 0)
+    ea_forward (window, -count, key);
+  else
+    {
+      input_line_point -= count;
+      if (input_line_point < input_line_beg)
+	input_line_point = input_line_beg;
+    }
+}
+
+DECLARE_INFO_COMMAND (ea_beg_of_line, "Move to the start of this line")
+{
+  input_line_point = input_line_beg;
+}
+
+DECLARE_INFO_COMMAND (ea_end_of_line, "Move to the end of this line")
+{
+  input_line_point = input_line_end;
+}
+
+#define alphabetic(c) (islower (c) || isupper (c) || isdigit (c))
+
+/* Move forward a word in the input line. */
+DECLARE_INFO_COMMAND (ea_forward_word, "Move forward a word")
+{
+  int c;
+
+  if (count < 0)
+    ea_backward_word (window, -count, key);
+  else
+    {
+      while (count--)
+	{
+	  if (input_line_point == input_line_end)
+	    return;
+
+	  /* If we are not in a word, move forward until we are in one.
+	     Then, move forward until we hit a non-alphabetic character. */
+	  c = input_line[input_line_point];
+
+	  if (!alphabetic (c))
+	    {
+	      while (++input_line_point < input_line_end)
+		{
+		  c = input_line[input_line_point];
+		  if (alphabetic (c))
+		    break;
+		}
+	    }
+
+	  if (input_line_point == input_line_end)
+	    return;
+
+	  while (++input_line_point < input_line_end)
+	    {
+	      c = input_line[input_line_point];
+	      if (!alphabetic (c))
+		break;
+	    }
+	}
+    }
+}
+
+DECLARE_INFO_COMMAND (ea_backward_word, "Move backward a word")
+{
+  int c;
+
+  if (count < 0)
+    ea_forward_word (window, -count, key);
+  else
+    {
+      while (count--)
+	{
+	  if (input_line_point == input_line_beg)
+	    return;
+
+	  /* Like ea_forward_word (), except that we look at the
+	     characters just before point. */
+
+	  c = input_line[input_line_point - 1];
+
+	  if (!alphabetic (c))
+	    {
+	      while (--input_line_point)
+		{
+		  c = input_line[input_line_point - 1];
+		  if (alphabetic (c))
+		    break;
+		}
+	    }
+
+	  while (input_line_point != input_line_beg)
+	    {
+	      c = input_line[input_line_point - 1];
+	      if (!alphabetic (c))
+		break;
+	      else
+		--input_line_point;
+	    }
+	}
+    }
+}
+
+DECLARE_INFO_COMMAND (ea_delete, "Delete the character under the cursor")
+{
+  register int i;
+
+  if (count < 0)
+    ea_rubout (window, -count, key);
+  else
+    {
+      if (input_line_point == input_line_end)
+	return;
+
+      if (info_explicit_arg || count > 1)
+	{
+	  int orig_point;
+
+	  orig_point = input_line_point;
+	  ea_forward (window, count, key);
+	  ea_kill_text (orig_point, input_line_point);
+	  input_line_point = orig_point;
+	}
+      else
+	{
+	  for (i = input_line_point; i < input_line_end; i++)
+	    input_line[i] = input_line[i + 1];
+
+	  input_line_end--;
+	}
+    }
+}
+
+DECLARE_INFO_COMMAND (ea_rubout, "Delete the character behind the cursor")
+{
+  if (count < 0)
+    ea_delete (window, -count, key);
+  else
+    {
+      int start;
+
+      if (input_line_point == input_line_beg)
+	return;
+
+      start = input_line_point;
+      ea_backward (window, count, key);
+
+      if (info_explicit_arg || count > 1)
+	ea_kill_text (start, input_line_point);
+      else
+	ea_delete (window, count, key);
+    }
+}
+
+DECLARE_INFO_COMMAND (ea_abort, "Cancel or quit operation")
+{
+  /* If any text, just discard it, and restore the calling window's node.
+     If no text, quit. */
+  if (input_line_end != input_line_beg)
+    {
+      terminal_ring_bell ();
+      input_line_end = input_line_point = input_line_beg;
+      if (calling_window->node != calling_window_node)
+	restore_calling_window ();
+    }
+  else
+    info_aborted_echo_area = 1;
+}
+
+DECLARE_INFO_COMMAND (ea_newline, "Accept (or force completion of) this line")
+{
+  /* Stub does nothing.  Simply here to see if it has been executed. */
+}
+
+DECLARE_INFO_COMMAND (ea_quoted_insert, "Insert next character verbatim")
+{
+  unsigned char character;
+
+  character = info_get_another_input_char ();
+  ea_insert (window, count, character);
+}
+
+DECLARE_INFO_COMMAND (ea_insert, "Insert this character")
+{
+  register int i;
+
+  if ((input_line_end + 1) == EA_MAX_INPUT)
+    {
+      terminal_ring_bell ();
+      return;
+    }
+
+  for (i = input_line_end + 1; i != input_line_point; i--)
+    input_line[i] = input_line[i - 1];
+
+  input_line[input_line_point] = key;
+  input_line_point++;
+  input_line_end++;
+}
+
+DECLARE_INFO_COMMAND (ea_tab_insert, "Insert a TAB character")
+{
+  ea_insert (window, count, '\t');
+}
+
+/* Transpose the characters at point.  If point is at the end of the line,
+   then transpose the characters before point. */
+DECLARE_INFO_COMMAND (ea_transpose_chars, "Transpose characters at point")
+{
+  /* Handle conditions that would make it impossible to transpose
+     characters. */
+  if (!count || !input_line_point || (input_line_end - input_line_beg) < 2)
+    return;
+
+  while (count)
+    {
+      int t;
+      if (input_line_point == input_line_end)
+	{
+	  t = input_line[input_line_point - 1];
+
+	  input_line[input_line_point - 1] = input_line[input_line_point - 2];
+	  input_line[input_line_point - 2] = t;
+	}
+      else
+	{
+	  t = input_line[input_line_point];
+
+	  input_line[input_line_point] = input_line[input_line_point - 1];
+	  input_line[input_line_point - 1] = t;
+
+	  if (count < 0 && input_line_point != input_line_beg)
+	    input_line_point--;
+	  else
+	    input_line_point++;
+	}
+
+      if (count < 0)
+	count++;
+      else
+	count--;
+    }
+}
+
+/* **************************************************************** */
+/*								    */
+/*		     Echo Area Killing and Yanking		    */
+/*								    */
+/* **************************************************************** */
+
+static char **kill_ring = (char **)NULL;
+static int kill_ring_index = 0;	/* Number of kills appearing in KILL_RING. */
+static int kill_ring_slots = 0;	/* Number of slots allocated to KILL_RING. */
+static int kill_ring_loc = 0;	/* Location of current yank pointer. */
+
+/* The largest number of kills that we remember at one time. */
+static int max_retained_kills = 15;
+
+DECLARE_INFO_COMMAND (ea_yank, "Yank back the contents of the last kill")
+{
+  register int i;
+  register char *text;
+
+  if (!kill_ring_index)
+    {
+      inform_in_echo_area ("Kill ring is empty");
+      return;
+    }
+
+  text = kill_ring[kill_ring_loc];
+
+  for (i = 0; text[i]; i++)
+    ea_insert (window, 1, text[i]);
+}
+
+/* If the last command was yank, or yank_pop, and the text just before
+   point is identical to the current kill item, then delete that text
+   from the line, rotate the index down, and yank back some other text. */
+DECLARE_INFO_COMMAND (ea_yank_pop, "Yank back a previous kill")
+{
+  register int len;
+
+  if (((ea_last_executed_command != ea_yank) &&
+       (ea_last_executed_command != ea_yank_pop)) ||
+      (kill_ring_index == 0))
+    return;
+
+  len = strlen (kill_ring[kill_ring_loc]);
+
+  /* Delete the last yanked item from the line. */
+  {
+    register int i, counter;
+
+    counter = input_line_end - input_line_point;
+    
+    for (i = input_line_point - len; counter; i++, counter--)
+      input_line[i] = input_line[i + len];
+
+    input_line_end -= len;
+    input_line_point -= len;
+  }
+
+  /* Get a previous kill, and yank that. */
+  kill_ring_loc--;
+  if (kill_ring_loc < 0)
+    kill_ring_loc = kill_ring_index - 1;
+
+  ea_yank (window, count, key);
+}
+
+/* Delete the text from point to end of line. */
+DECLARE_INFO_COMMAND (ea_kill_line, "Kill to the end of the line")
+{
+  if (count < 0)
+    {
+      ea_kill_text (input_line_point, input_line_beg);
+      input_line_point = input_line_beg;
+    }
+  else
+    ea_kill_text (input_line_point, input_line_end);
+}
+
+/* Delete the text from point to beg of line. */
+DECLARE_INFO_COMMAND (ea_backward_kill_line,
+		      "Kill to the beginning of the line")
+{
+  if (count < 0)
+    ea_kill_text (input_line_point, input_line_end);
+  else
+    {
+      ea_kill_text (input_line_point, input_line_beg);
+      input_line_point = input_line_beg;
+    }
+}
+
+/* Delete from point to the end of the current word. */
+DECLARE_INFO_COMMAND (ea_kill_word, "Kill the word following the cursor")
+{
+  int orig_point = input_line_point;
+
+  if (count < 0)
+    ea_backward_kill_word (window, -count, key);
+  else
+    {
+      ea_forward_word (window, count, key);
+
+      if (input_line_point != orig_point)
+	ea_kill_text (orig_point, input_line_point);
+
+      input_line_point = orig_point;
+    }
+}
+
+/* Delete from point to the start of the current word. */
+DECLARE_INFO_COMMAND (ea_backward_kill_word,
+		      "Kill the word preceding the cursor")
+{
+  int orig_point = input_line_point;
+
+  if (count < 0)
+    ea_kill_word (window, -count, key);
+  else
+    {
+      ea_backward_word (window, count, key);
+
+      if (input_line_point != orig_point)
+	ea_kill_text (orig_point, input_line_point);
+    }
+}
+
+/* The way to kill something.  This appends or prepends to the last
+   kill, if the last command was a kill command.  If FROM is less
+   than TO, then the killed text is appended to the most recent kill,
+   otherwise it is prepended.  If the last command was not a kill command,
+   then a new slot is made for this kill. */
+static void
+ea_kill_text (from, to)
+     int from, to;
+{
+  register int i, counter, distance;
+  int killing_backwards, slot;
+  char *killed_text;
+
+  killing_backwards = (from > to);
+
+  /* If killing backwards, reverse the values of FROM and TO. */
+  if (killing_backwards)
+    {
+      int temp = from;
+      from = to;
+      to = temp;
+    }
+
+  /* Remember the text that we are about to delete. */
+  distance = to - from;
+  killed_text = (char *)xmalloc (1 + distance);
+  strncpy (killed_text, &input_line[from], distance);
+  killed_text[distance] = '\0';
+
+  /* Actually delete the text from the line. */
+  counter = input_line_end - to;
+
+  for (i = from; counter; i++, counter--)
+    input_line[i] = input_line[i + distance];
+
+  input_line_end -= distance;
+
+  /* If the last command was a kill, append or prepend the killed text to
+     the last command's killed text. */
+  if (echo_area_last_command_was_kill)
+    {
+      char *old, *new;
+
+      slot = kill_ring_loc;
+      old = kill_ring[slot];
+      new = (char *)xmalloc (1 + strlen (old) + strlen (killed_text));
+
+      if (killing_backwards)
+	{
+	  /* Prepend TEXT to current kill. */
+	  strcpy (new, killed_text);
+	  strcat (new, old);
+	}
+      else
+	{
+	  /* Append TEXT to current kill. */
+	  strcpy (new, old);
+	  strcat (new, killed_text);
+	}
+
+      free (old);
+      free (killed_text);
+      kill_ring[slot] = new;
+    }
+  else
+    {
+      /* Try to store the kill in a new slot, unless that would cause there
+	 to be too many remembered kills. */
+      slot = kill_ring_index;
+
+      if (slot == max_retained_kills)
+	slot = 0;
+
+      if (slot + 1 > kill_ring_slots)
+	kill_ring = (char **) xrealloc
+	  (kill_ring,
+	   (kill_ring_slots += max_retained_kills) * sizeof (char *));
+
+      if (slot != kill_ring_index)
+	free (kill_ring[slot]);
+      else
+	kill_ring_index++;
+
+      kill_ring[slot] = killed_text;
+
+      kill_ring_loc = slot;
+    }
+
+  /* Notice that the last command was a kill. */
+  echo_area_last_command_was_kill++;
+}
+
+/* **************************************************************** */
+/*								    */
+/*			Echo Area Completion			    */
+/*								    */
+/* **************************************************************** */
+
+/* Pointer to an array of REFERENCE to complete over. */
+static REFERENCE **echo_area_completion_items = (REFERENCE **)NULL;
+
+/* Sorted array of REFERENCE * which is the possible completions found in
+   the variable echo_area_completion_items.  If there is only one element,
+   it is the only possible completion. */
+static REFERENCE **completions_found = (REFERENCE **)NULL;
+static int completions_found_index = 0;
+static int completions_found_slots = 0;
+
+/* The lowest common denominator found while completing. */
+static REFERENCE *LCD_completion;
+
+/* Internal functions used by the user calls. */
+static void build_completions (), completions_must_be_rebuilt ();
+
+/* Variable which holds the output of completions. */
+static NODE *possible_completions_output_node = (NODE *)NULL;
+
+static char *compwin_name = "*Completions*";
+
+/* Return non-zero if WINDOW is a window used for completions output. */
+static int
+completions_window_p (window)
+     WINDOW *window;
+{
+  int result = 0;
+
+  if (internal_info_node_p (window->node) &&
+      (strcmp (window->node->nodename, compwin_name) == 0))
+    result = 1;
+
+  return (result);
+}
+
+/* Workhorse for completion readers.  If FORCE is non-zero, the user cannot
+   exit unless the line read completes, or is empty. */
+char *
+info_read_completing_internal (window, prompt, completions, force)
+     WINDOW *window;
+     char *prompt;
+     REFERENCE **completions;
+     int force;
+{
+  char *line;
+
+  /* If the echo area is already active, remember the current state. */
+  if (echo_area_is_active)
+    push_echo_area ();
+
+  echo_area_must_complete_p = force;
+
+  /* Initialize our local variables. */
+  initialize_input_line (prompt);
+
+  /* Initialize the echo area for the first (but maybe not the last) time. */
+  echo_area_initialize_node ();
+
+  /* Save away the original node of this window, and the window itself,
+     so echo area commands can temporarily use this window. */
+  remember_calling_window (window);
+
+  /* Save away the list of items to complete over. */
+  echo_area_completion_items = completions;
+  completions_must_be_rebuilt ();
+
+  active_window = the_echo_area;
+  echo_area_is_active++;
+
+  /* Read characters in the echo area. */
+  while (1)
+    {
+      info_read_and_dispatch ();
+
+      line = echo_area_after_read ();
+
+      /* Force the completion to take place if the user hasn't accepted
+	 a default or aborted, and if FORCE is active. */
+      if (force && line && *line && completions)
+	{
+	  register int i;
+
+	  build_completions ();
+
+	  /* If there is only one completion, then make the line be that
+	     completion. */
+	  if (completions_found_index == 1)
+	    {
+	      free (line);
+	      line = savestring (completions_found[0]->label);
+	      break;
+	    }
+
+	  /* If one of the completions matches exactly, then that is okay, so
+	     return the current line. */
+	  for (i = 0; i < completions_found_index; i++)
+	    if (stricmp (completions_found[i]->label, line) == 0)
+	      {
+		free (line);
+		line = savestring (completions_found[i]->label);
+		break;
+	      }
+
+	  /* If no match, go back and try again. */
+	  if (i == completions_found_index)
+	    {
+	      inform_in_echo_area ("Not complete");
+	      continue;
+	    }
+	}
+      break;
+    }
+  echo_area_is_active--;
+
+  /* Restore the original active window and show point in it. */
+  active_window = calling_window;
+  restore_calling_window ();
+  display_cursor_at_point (active_window);
+  fflush (stdout);
+
+  echo_area_completion_items = (REFERENCE **)NULL;
+  completions_must_be_rebuilt ();
+
+  /* If there is a previous loop waiting for us, restore it now. */
+  if (echo_area_is_active)
+    pop_echo_area ();
+
+  return (line);
+}
+  
+/* Read a line in the echo area with completion over COMPLETIONS. */
+char *
+info_read_completing_in_echo_area (window, prompt, completions)
+     WINDOW *window;
+     char *prompt;
+     REFERENCE **completions;
+{
+  return (info_read_completing_internal (window, prompt, completions, 1));
+}
+
+/* Read a line in the echo area allowing completion over COMPLETIONS, but
+   not requiring it. */
+char *
+info_read_maybe_completing (window, prompt, completions)
+     WINDOW *window;
+     char *prompt;
+     REFERENCE **completions;
+{
+  return (info_read_completing_internal (window, prompt, completions, 0));
+}
+
+DECLARE_INFO_COMMAND (ea_possible_completions, "List possible completions")
+{
+  if (!echo_area_completion_items)
+    {
+      ea_insert (window, count, key);
+      return;
+    }
+
+  build_completions ();
+
+  if (!completions_found_index)
+    {
+      terminal_ring_bell ();
+      inform_in_echo_area ("No completions");
+    }
+  else if ((completions_found_index == 1) && (key != '?'))
+    {
+      inform_in_echo_area ("Sole completion");
+    }
+  else
+    {
+      register int i, l;
+      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");
+
+      /* Find the maximum length of a label. */
+      for (i = 0; i < completions_found_index; i++)
+	{
+	  int len = strlen (completions_found[i]->label);
+	  if (len > max_label)
+	    max_label = len;
+	}
+
+      max_label += 4;
+
+      /* Find out how many columns we should print in. */
+      limit = calling_window->width / max_label;
+      if (limit != 1 && (limit * max_label == calling_window->width))
+	limit--;
+
+      /* Avoid a possible floating exception.  If max_label > width then
+	 the limit will be 0 and a divide-by-zero fault will result. */
+      if (limit == 0)
+	limit = 1;
+
+      /* How many iterations of the printing loop? */
+      count = (completions_found_index + (limit - 1)) / limit;
+
+      /* Watch out for special case.  If the number of completions is less
+	 than LIMIT, then just do the inner printing loop. */
+      if (completions_found_index < limit)
+	count = 1;
+
+      /* Print the sorted items, up-and-down alphabetically. */
+      for (i = 0; i < count; i++)
+	{
+	  register int j;
+
+	  for (j = 0, l = i; j < limit; j++)
+	    {
+	      if (l >= completions_found_index)
+		break;
+	      else
+		{
+		  char *label;
+		  int printed_length, k;
+
+		  label = completions_found[l]->label;
+		  printed_length = strlen (label);
+		  printf_to_message_buffer ("%s", label);
+
+		  if (j + 1 < limit)
+		    {
+		      for (k = 0; k < max_label - printed_length; k++)
+			printf_to_message_buffer (" ");
+		    }
+		}
+	      l += count;
+	    }
+	  printf_to_message_buffer ("\n");
+	}
+
+      /* Make a new node to hold onto possible completions.  Don't destroy
+	 dangling pointers. */
+      {
+	NODE *temp;
+
+	temp = message_buffer_to_node ();
+	add_gcable_pointer (temp->contents);
+	name_internal_node (temp, compwin_name);
+	possible_completions_output_node = temp;
+      }
+
+      /* Find a suitable window for displaying the completions output.
+	 First choice is an existing window showing completions output.
+	 If there is only one window, and it is large, make another
+	 (smaller) window, and use that one.  Otherwise, use the caller's
+	 window. */
+      {
+	WINDOW *compwin;
+
+	compwin = get_internal_info_window (compwin_name);
+
+	if (!compwin)
+	  {
+	    /* If we can split the window to display most of the completion
+	       items, then do so. */
+	    if (calling_window->height > (count * 2))
+	      {
+		int start, end, pagetop;
+
+		active_window = calling_window;
+
+		/* Perhaps we can scroll this window on redisplay. */
+		start = calling_window->first_row;
+		pagetop = calling_window->pagetop;
+
+		compwin =
+		  window_make_window (possible_completions_output_node);
+		active_window = the_echo_area;
+		window_change_window_height
+		  (compwin, -(compwin->height - (count + 2)));
+
+		window_adjust_pagetop (calling_window);
+		remember_calling_window (calling_window);
+
+#if defined (SPLIT_BEFORE_ACTIVE)
+		/* If the pagetop hasn't changed, scrolling the calling
+		   window is a reasonable thing to do. */
+		if (pagetop == calling_window->pagetop)
+		  {
+		    end = start + calling_window->height;
+		    display_scroll_display
+		      (start, end, calling_window->prev->height + 1);
+		  }
+#else /* !SPLIT_BEFORE_ACTIVE */
+		/* If the pagetop has changed, set the new pagetop here. */
+		if (pagetop != calling_window->pagetop)
+		  {
+		    int newtop = calling_window->pagetop;
+		    calling_window->pagetop = pagetop;
+		    set_window_pagetop (calling_window, newtop);
+		  }
+#endif /* !SPLIT_BEFORE_ACTIVE */
+
+		echo_area_completions_window = compwin;
+		remember_window_and_node (compwin, compwin->node);
+	      }
+	    else
+	      compwin = calling_window;
+	  }
+
+	if (compwin->node != possible_completions_output_node)
+	  {
+	    window_set_node_of_window
+	      (compwin, possible_completions_output_node);
+	    remember_window_and_node (compwin, compwin->node);
+	  }
+
+	display_update_display (windows);
+      }
+    }
+}
+
+DECLARE_INFO_COMMAND (ea_complete, "Insert completion")
+{
+  if (!echo_area_completion_items)
+    {
+      ea_insert (window, count, key);
+      return;
+    }
+
+  /* If KEY is SPC, and we are not forcing completion to take place, simply
+     insert the key. */
+  if (!echo_area_must_complete_p && key == SPC)
+    {
+      ea_insert (window, count, key);
+      return;
+    }
+
+  if (ea_last_executed_command == ea_complete)
+    {
+      /* If the keypress is a SPC character, and we have already tried
+	 completing once, and there are several completions, then check
+	 the batch of completions to see if any continue with a space.
+	 If there are some, insert the space character and continue. */
+      if (key == SPC && completions_found_index > 1)
+	{
+	  register int i, offset;
+
+	  offset = input_line_end - input_line_beg;
+
+	  for (i = 0; i < completions_found_index; i++)
+	    if (completions_found[i]->label[offset] == ' ')
+	      break;
+
+	  if (completions_found[i])
+	    ea_insert (window, 1, ' ');
+	  else
+	    {
+	      ea_possible_completions (window, count, key);
+	      return;
+	    }
+	}
+      else
+	{
+	  ea_possible_completions (window, count, key);
+	  return;
+	}
+    }
+
+  input_line_point = input_line_end;
+  build_completions ();
+
+  if (!completions_found_index)
+    terminal_ring_bell ();
+  else if (LCD_completion->label[0] == '\0')
+    ea_possible_completions (window, count, key);
+  else
+    {
+      register int i;
+      input_line_point = input_line_end = input_line_beg;
+      for (i = 0; LCD_completion->label[i]; i++)
+	ea_insert (window, 1, LCD_completion->label[i]);
+    }
+}
+
+/* Utility REFERENCE used to store possible LCD. */
+static REFERENCE LCD_reference = { (char *)NULL, (char *)NULL, (char *)NULL };
+
+static void remove_completion_duplicates ();
+
+/* Variables which remember the state of the most recent call
+   to build_completions (). */
+static char *last_completion_request = (char *)NULL;
+static REFERENCE **last_completion_items = (REFERENCE **)NULL;
+
+/* How to tell the completion builder to reset internal state. */
+static void
+completions_must_be_rebuilt ()
+{
+  maybe_free (last_completion_request);
+  last_completion_request = (char *)NULL;
+  last_completion_items = (REFERENCE **)NULL;
+}
+
+/* Build a list of possible completions from echo_area_completion_items,
+   and the contents of input_line. */
+static void
+build_completions ()
+{
+  register int i, len;
+  register REFERENCE *entry;
+  char *request;
+  int informed_of_lengthy_job = 0;
+
+  /* If there are no items to complete over, exit immediately. */
+  if (!echo_area_completion_items)
+    {
+      completions_found_index = 0;
+      LCD_completion = (REFERENCE *)NULL;
+      return;
+    }
+
+  /* Check to see if this call to build completions is the same as the last
+     call to build completions. */
+  len = input_line_end - input_line_beg;
+  request = (char *)xmalloc (1 + len);
+  strncpy (request, &input_line[input_line_beg], len);
+  request[len] = '\0';
+
+  if (last_completion_request && last_completion_items &&
+      last_completion_items == echo_area_completion_items &&
+      (strcmp (last_completion_request, request) == 0))
+    {
+      free (request);
+      return;
+    }
+
+  maybe_free (last_completion_request);
+  last_completion_request = request;
+  last_completion_items = echo_area_completion_items;
+
+  /* Always start at the beginning of the list. */
+  completions_found_index = 0;
+  LCD_completion = (REFERENCE *)NULL;
+
+  for (i = 0; entry = echo_area_completion_items[i]; i++)
+    {
+      if (strnicmp (request, entry->label, len) == 0)
+	add_pointer_to_array (entry, completions_found_index,
+			      completions_found, completions_found_slots,
+			      20, REFERENCE *);
+
+      if (!informed_of_lengthy_job && completions_found_index > 100)
+	{
+	  informed_of_lengthy_job = 1;
+	  window_message_in_echo_area ("Building completions...");
+	}
+    }
+
+  if (!completions_found_index)
+    return;
+
+  /* Sort and prune duplicate entries from the completions array. */
+  remove_completion_duplicates ();
+
+  /* If there is only one completion, just return that. */
+  if (completions_found_index == 1)
+    {
+      LCD_completion = completions_found[0];
+      return;
+    }
+
+  /* Find the least common denominator. */
+  {
+    long shortest = 100000;
+
+    for (i = 1; i < completions_found_index; i++)
+      {
+	register int j;
+	int c1, c2;
+
+	for (j = 0;
+	     (c1 = info_tolower (completions_found[i - 1]->label[j])) &&
+	     (c2 = info_tolower (completions_found[i]->label[j]));
+	     j++)
+	  if (c1 != c2)
+	    break;
+
+	if (shortest > j)
+	  shortest = j;
+      }
+
+    maybe_free (LCD_reference.label);
+    LCD_reference.label = (char *)xmalloc (1 + shortest);
+    strncpy (LCD_reference.label, completions_found[0]->label, shortest);
+    LCD_reference.label[shortest] = '\0';
+    LCD_completion = &LCD_reference;
+  }
+
+  if (informed_of_lengthy_job)
+    echo_area_initialize_node ();
+}
+
+/* Function called by qsort. */
+static int
+compare_references (entry1, entry2)
+     REFERENCE **entry1, **entry2;
+{
+  return (stricmp ((*entry1)->label, (*entry2)->label));
+}
+
+/* Prune duplicate entries from COMPLETIONS_FOUND. */
+static void
+remove_completion_duplicates ()
+{
+  register int i, j;
+  REFERENCE **temp;
+  int newlen;
+
+  if (!completions_found_index)
+    return;
+
+  /* Sort the items. */
+  qsort (completions_found, completions_found_index, sizeof (REFERENCE *),
+	 compare_references);
+
+  for (i = 0, newlen = 1; i < completions_found_index - 1; i++)
+    {
+      if (strcmp (completions_found[i]->label,
+		  completions_found[i + 1]->label) == 0)
+	completions_found[i] = (REFERENCE *)NULL;
+      else
+	newlen++;
+    }
+
+  /* We have marked all the dead slots.  It is faster to copy the live slots
+     twice than to prune the dead slots one by one. */
+  temp = (REFERENCE **)xmalloc ((1 + newlen) * sizeof (REFERENCE *));
+  for (i = 0, j = 0; i < completions_found_index; i++)
+    if (completions_found[i])
+      temp[j++] = completions_found[i];
+
+  for (i = 0; i < newlen; i++)
+    completions_found[i] = temp[i];
+
+  completions_found[i] = (REFERENCE *)NULL;
+  completions_found_index = newlen;
+  free (temp);
+}
+
+/* Scroll the "other" window.  If there is a window showing completions, scroll
+   that one, otherwise scroll the window which was active on entering the read
+   function. */
+DECLARE_INFO_COMMAND (ea_scroll_completions_window, "Scroll the completions window")
+{
+  WINDOW *compwin;
+  int old_pagetop;
+
+  compwin = get_internal_info_window (compwin_name);
+
+  if (!compwin)
+    compwin = calling_window;
+
+  old_pagetop = compwin->pagetop;
+
+  /* Let info_scroll_forward () do the work, and print any messages that
+     need to be displayed. */
+  info_scroll_forward (compwin, count, key);
+}
+
+/* Function which gets called when an Info window is deleted while the
+   echo area is active.  WINDOW is the window which has just been deleted. */
+void
+echo_area_inform_of_deleted_window (window)
+     WINDOW *window;
+{
+  /* If this is the calling_window, forget what we remembered about it. */
+  if (window == calling_window)
+    {
+      if (active_window != the_echo_area)
+	remember_calling_window (active_window);
+      else
+	remember_calling_window (windows);
+    }
+
+  /* If this window was the echo_area_completions_window, then notice that
+     the window has been deleted. */
+  if (window == echo_area_completions_window)
+    echo_area_completions_window = (WINDOW *)NULL;
+}
+
+/* **************************************************************** */
+/*								    */
+/*		   Pushing and Popping the Echo Area		    */
+/*								    */
+/* **************************************************************** */
+
+/* Push and Pop the echo area. */
+typedef struct {
+  char *line;
+  char *prompt;
+  REFERENCE **comp_items;
+  int point, beg, end;
+  int must_complete;
+  NODE node;
+  WINDOW *compwin;
+} PUSHED_EA;
+
+static PUSHED_EA **pushed_echo_areas = (PUSHED_EA **)NULL;
+static int pushed_echo_areas_index = 0;
+static int pushed_echo_areas_slots = 0;
+
+/* Pushing the echo_area has a side effect of zeroing the completion_items. */
+static void
+push_echo_area ()
+{
+  PUSHED_EA *pushed;
+
+  pushed = (PUSHED_EA *)xmalloc (sizeof (PUSHED_EA));
+  pushed->line = savestring (input_line);
+  pushed->prompt = input_line_prompt;
+  pushed->point = input_line_point;
+  pushed->beg = input_line_beg;
+  pushed->end = input_line_end;
+  pushed->node = input_line_node;
+  pushed->comp_items = echo_area_completion_items;
+  pushed->must_complete = echo_area_must_complete_p;
+  pushed->compwin = echo_area_completions_window;
+
+  add_pointer_to_array (pushed, pushed_echo_areas_index, pushed_echo_areas,
+			pushed_echo_areas_slots, 4, PUSHED_EA *);
+
+  echo_area_completion_items = (REFERENCE **)NULL;
+}
+
+static void
+pop_echo_area ()
+{
+  PUSHED_EA *popped;
+
+  popped = pushed_echo_areas[--pushed_echo_areas_index];
+
+  strcpy (input_line, popped->line);
+  free (popped->line);
+  input_line_prompt = popped->prompt;
+  input_line_point = popped->point;
+  input_line_beg = popped->beg;
+  input_line_end = popped->end;
+  input_line_node = popped->node;
+  echo_area_completion_items = popped->comp_items;
+  echo_area_must_complete_p = popped->must_complete;
+  echo_area_completions_window = popped->compwin;
+  completions_must_be_rebuilt ();
+
+  /* If the completion window no longer exists, forget about it. */
+  if (echo_area_completions_window)
+    {
+      register WINDOW *win;
+
+      for (win = windows; win; win = win->next)
+	if (echo_area_completions_window == win)
+	  break;
+
+      /* If the window wasn't found, then it has already been deleted. */
+      if (!win)
+	echo_area_completions_window = (WINDOW *)NULL;
+    }
+
+  free (popped);
+}
+
+static int
+echo_area_stack_depth ()
+{
+  return (pushed_echo_areas_index);
+}
+
+/* Returns non-zero if any of the prior stacked calls to read in the echo
+   area produced a completions window. */
+static int
+echo_area_stack_contains_completions_p ()
+{
+  register int i;
+
+  for (i = 0; i < pushed_echo_areas_index; i++)
+    if (pushed_echo_areas[i]->compwin)
+      return (1);
+
+  return (0);
+}
+
+/* **************************************************************** */
+/*								    */
+/*	       Error Messages While Reading in Echo Area	    */
+/*								    */
+/* **************************************************************** */
+
+#if defined (HAVE_SYS_TIME_H)
+#  include <sys/time.h>
+#  define HAVE_STRUCT_TIMEVAL
+#endif /* HAVE_SYS_TIME_H */
+
+static void
+pause_or_input ()
+{
+#if defined (FD_SET)
+  struct timeval timer;
+  fd_set readfds;
+  int ready;
+
+  FD_ZERO (&readfds);
+  FD_SET (fileno (stdin), &readfds);
+  timer.tv_sec = 2;
+  timer.tv_usec = 750;
+  ready = select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer);
+#endif /* FD_SET */
+}
+
+/* Print MESSAGE right after the end of the current line, and wait
+   for input or 2.75 seconds, whichever comes first.  Then flush the
+   informational message that was printed. */
+void
+inform_in_echo_area (message)
+     char *message;
+{
+  register int i;
+  char *text;
+
+  text = savestring (message);
+  for (i = 0; text[i] && text[i] != '\n'; i++);
+  text[i] = '\0';
+
+  echo_area_initialize_node ();
+  sprintf (&input_line[input_line_end], "%s[%s]\n",
+	   echo_area_is_active ? " ": "", text);
+  free (text);
+  the_echo_area->point = input_line_point;
+  display_update_one_window (the_echo_area);
+  display_cursor_at_point (active_window);
+  fflush (stdout);
+  pause_or_input ();
+  echo_area_initialize_node ();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/echo_area.h	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,63 @@
+/* echo_area.h -- Functions used in reading information from the echo area. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#if !defined (_ECHO_AREA_H_)
+#define _ECHO_AREA_H_
+
+#define EA_MAX_INPUT 256
+
+extern int echo_area_is_active, info_aborted_echo_area;
+
+/* Non-zero means that the last command executed while reading input
+   killed some text. */
+extern int echo_area_last_command_was_kill;
+
+extern void inform_in_echo_area (), echo_area_inform_of_deleted_window ();
+extern void echo_area_prep_read ();
+extern VFunction *ea_last_executed_command;
+
+/* Read a line of text in the echo area.  Return a malloc ()'ed string,
+   or NULL if the user aborted out of this read.  WINDOW is the currently
+   active window, so that we can restore it when we need to.  PROMPT, if
+   non-null, is a prompt to print before reading the line. */
+extern char *info_read_in_echo_area ();
+
+/* Read a line in the echo area with completion over COMPLETIONS.
+   Takes arguments of WINDOW, PROMPT, and COMPLETIONS, a REFERENCE **. */
+char *info_read_completing_in_echo_area ();
+
+/* Read a line in the echo area allowing completion over COMPLETIONS, but
+   not requiring it.  Takes arguments of WINDOW, PROMPT, and COMPLETIONS,
+   a REFERENCE **. */
+extern char *info_read_maybe_completing ();
+
+extern void ea_insert (), ea_quoted_insert ();
+extern void ea_beg_of_line (), ea_backward (), ea_delete (), ea_end_of_line ();
+extern void ea_forward (), ea_abort (), ea_rubout (), ea_complete ();
+extern void ea_newline (), ea_kill_line (), ea_transpose_chars ();
+extern void ea_yank (), ea_tab_insert (), ea_possible_completions ();
+extern void ea_backward_word (), ea_kill_word (), ea_forward_word ();
+extern void ea_yank_pop (), ea_backward_kill_word ();
+extern void ea_scroll_completions_window ();
+
+#endif /* _ECHO_AREA_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/filesys.c	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,624 @@
+/* filesys.c -- File system specific functions for hacking this system. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <sys/errno.h>
+#include "general.h"
+#include "tilde.h"
+#include "filesys.h"
+
+#if !defined (O_RDONLY)
+#if defined (HAVE_SYS_FCNTL_H)
+#include <sys/fcntl.h>
+#else /* !HAVE_SYS_FCNTL_H */
+#include <fcntl.h>
+#endif /* !HAVE_SYS_FCNTL_H */
+#endif /* !O_RDONLY */
+
+#if !defined (errno)
+extern int errno;
+#endif /* !errno */
+
+/* Found in info-utils.c. */
+extern char *filename_non_directory ();
+
+#if !defined (BUILDING_LIBRARY)
+/* Found in session.c */
+extern int info_windows_initialized_p;
+
+/* Found in window.c. */
+extern void message_in_echo_area (), unmessage_in_echo_area ();
+#endif /* !BUILDING_LIBRARY */
+
+/* Local to this file. */
+static char *info_file_in_path (), *lookup_info_filename ();
+static void remember_info_filename (), maybe_initialize_infopath ();
+
+#if !defined (NULL)
+#  define NULL 0x0
+#endif /* !NULL */
+
+typedef struct {
+  char *suffix;
+  char *decompressor;
+} COMPRESSION_ALIST;
+
+static char *info_suffixes[] = {
+  "",
+  ".info",
+  "-info",
+  (char *)NULL
+};
+
+static COMPRESSION_ALIST compress_suffixes[] = {
+  { ".Z", "uncompress" },
+  { ".Y", "unyabba" },
+  { ".z", "gunzip" },
+  { (char *)NULL, (char *)NULL }
+};
+
+/* The path on which we look for info files.  You can initialize this
+   from the environment variable INFOPATH if there is one, or you can
+   call info_add_path () to add paths to the beginning or end of it.
+   You can call zap_infopath () to make the path go away. */
+char *infopath = (char *)NULL;
+static int infopath_size = 0;
+
+/* Expand the filename in PARTIAL to make a real name for this operating
+   system.  This looks in INFO_PATHS in order to find the correct file.
+   If it can't find the file, it returns NULL. */
+static char *local_temp_filename = (char *)NULL;
+static int local_temp_filename_size = 0;
+
+char *
+info_find_fullpath (partial)
+     char *partial;
+{
+  int initial_character;
+  char *temp;
+
+  filesys_error_number = 0;
+
+  maybe_initialize_infopath ();
+
+  if (partial && (initial_character = *partial))
+    {
+      char *expansion;
+
+      expansion = lookup_info_filename (partial);
+
+      if (expansion)
+	return (expansion);
+
+      /* If we have the full path to this file, we still may have to add
+	 various extensions to it.  I guess we have to stat this file
+	 after all. */
+      if (initial_character == '/')
+	temp = info_file_in_path (partial + 1, "/");
+      else if (initial_character == '~')
+	{
+	  expansion = tilde_expand_word (partial);
+	  if (*expansion == '/')
+	    {
+	      temp = info_file_in_path (expansion + 1, "/");
+	      free (expansion);
+	    }
+	  else
+	    temp = expansion;
+	}
+      else if (initial_character == '.' &&
+	       (partial[1] == '/' || (partial[1] == '.' && partial[2] == '/')))
+	{
+	  if (local_temp_filename_size < 1024)
+	    local_temp_filename = (char *)xrealloc
+	      (local_temp_filename, (local_temp_filename_size = 1024));
+#if defined (HAVE_GETCWD)
+	  if (!getcwd (local_temp_filename, local_temp_filename_size))
+#else /*  !HAVE_GETCWD */
+	  if (!getwd (local_temp_filename))
+#endif /* !HAVE_GETCWD */
+	    {
+	      filesys_error_number = errno;
+	      return (partial);
+	    }
+
+	  strcat (local_temp_filename, "/");
+	  strcat (local_temp_filename, partial);
+	  return (local_temp_filename);
+	}
+      else
+	temp = info_file_in_path (partial, infopath);
+
+      if (temp)
+	{
+	  remember_info_filename (partial, temp);
+	  if (strlen (temp) > local_temp_filename_size)
+	    local_temp_filename = (char *) xrealloc
+	      (local_temp_filename,
+	       (local_temp_filename_size = (50 + strlen (temp))));
+	  strcpy (local_temp_filename, temp);
+	  free (temp);
+	  return (local_temp_filename);
+	}
+    }
+  return (partial);
+}
+
+/* Scan the list of directories in PATH looking for FILENAME.  If we find
+   one that is a regular file, return it as a new string.  Otherwise, return
+   a NULL pointer. */
+static char *
+info_file_in_path (filename, path)
+     char *filename, *path;
+{
+  struct stat finfo;
+  char *temp_dirname;
+  int statable, dirname_index;
+
+  dirname_index = 0;
+
+  while (temp_dirname = extract_colon_unit (path, &dirname_index))
+    {
+      register int i, pre_suffix_length;
+      char *temp;
+
+      /* Expand a leading tilde if one is present. */
+      if (*temp_dirname == '~')
+	{
+	  char *expanded_dirname;
+
+	  expanded_dirname = tilde_expand_word (temp_dirname);
+	  free (temp_dirname);
+	  temp_dirname = expanded_dirname;
+	}
+
+      temp = (char *)xmalloc (30 + strlen (temp_dirname) + strlen (filename));
+      strcpy (temp, temp_dirname);
+      if (temp[(strlen (temp)) - 1] != '/')
+	strcat (temp, "/");
+      strcat (temp, filename);
+
+      pre_suffix_length = strlen (temp);
+
+      free (temp_dirname);
+
+      for (i = 0; info_suffixes[i]; i++)
+	{
+	  strcpy (temp + pre_suffix_length, info_suffixes[i]);
+
+	  statable = (stat (temp, &finfo) == 0);
+
+	  /* If we have found a regular file, then use that.  Else, if we
+	     have found a directory, look in that directory for this file. */
+	  if (statable)
+	    {
+	      if (S_ISREG (finfo.st_mode))
+		{
+		  return (temp);
+		}
+	      else if (S_ISDIR (finfo.st_mode))
+		{
+		  char *newpath, *filename_only, *newtemp;
+
+		  newpath = savestring (temp);
+		  filename_only = filename_non_directory (filename);
+		  newtemp = info_file_in_path (filename_only, newpath);
+
+		  free (newpath);
+		  if (newtemp)
+		    {
+		      free (temp);
+		      return (newtemp);
+		    }
+		}
+	    }
+	  else
+	    {
+	      /* Add various compression suffixes to the name to see if
+		 the file is present in compressed format. */
+	      register int j, pre_compress_suffix_length;
+
+	      pre_compress_suffix_length = strlen (temp);
+
+	      for (j = 0; compress_suffixes[j].suffix; j++)
+		{
+		  strcpy (temp + pre_compress_suffix_length,
+			  compress_suffixes[j].suffix);
+
+		  statable = (stat (temp, &finfo) == 0);
+		  if (statable && (S_ISREG (finfo.st_mode)))
+		    return (temp);
+		}
+	    }
+	}
+      free (temp);
+    }
+  return ((char *)NULL);
+}
+
+/* Given a string containing units of information separated by colons,
+   return the next one pointed to by IDX, or NULL if there are no more.
+   Advance IDX to the character after the colon. */
+char *
+extract_colon_unit (string, idx)
+     char *string;
+     int *idx;
+{
+  register int i, start;
+
+  i = start = *idx;
+  if ((i >= strlen (string)) || !string)
+    return ((char *) NULL);
+
+  while (string[i] && string[i] != ':')
+    i++;
+  if (i == start)
+    {
+      return ((char *) NULL);
+    }
+  else
+    {
+      char *value = (char *) xmalloc (1 + (i - start));
+      strncpy (value, &string[start], (i - start));
+      value[i - start] = '\0';
+      if (string[i])
+	++i;
+      *idx = i;
+      return (value);
+    }
+}
+
+/* A structure which associates a filename with its expansion. */
+typedef struct {
+  char *filename;
+  char *expansion;
+} FILENAME_LIST;
+
+/* An array of remembered arguments and results. */
+static FILENAME_LIST **names_and_files = (FILENAME_LIST **)NULL;
+static int names_and_files_index = 0;
+static int names_and_files_slots = 0;
+
+/* Find the result for having already called info_find_fullpath () with
+   FILENAME. */
+static char *
+lookup_info_filename (filename)
+     char *filename;
+{
+  if (filename && names_and_files)
+    {
+      register int i;
+      for (i = 0; names_and_files[i]; i++)
+	{
+	  if (strcmp (names_and_files[i]->filename, filename) == 0)
+	    return (names_and_files[i]->expansion);
+	}
+    }
+  return (char *)NULL;;
+}
+
+/* Add a filename and its expansion to our list. */
+static void
+remember_info_filename (filename, expansion)
+     char *filename, *expansion;
+{
+  FILENAME_LIST *new;
+
+  if (names_and_files_index + 2 > names_and_files_slots)
+    {
+      int alloc_size;
+      names_and_files_slots += 10;
+
+      alloc_size = names_and_files_slots * sizeof (FILENAME_LIST *);
+
+      names_and_files =
+	(FILENAME_LIST **) xrealloc (names_and_files, alloc_size);
+    }
+
+  new = (FILENAME_LIST *)xmalloc (sizeof (FILENAME_LIST));
+  new->filename = savestring (filename);
+  new->expansion = expansion ? savestring (expansion) : (char *)NULL;
+
+  names_and_files[names_and_files_index++] = new;
+  names_and_files[names_and_files_index] = (FILENAME_LIST *)NULL;
+}
+
+static void
+maybe_initialize_infopath ()
+{
+  if (!infopath_size)
+    {
+      infopath = (char *)
+	xmalloc (infopath_size = (1 + strlen (DEFAULT_INFOPATH)));
+
+      strcpy (infopath, DEFAULT_INFOPATH);
+    }
+}
+
+/* Add PATH to the list of paths found in INFOPATH.  2nd argument says
+   whether to put PATH at the front or end of INFOPATH. */
+void
+info_add_path (path, where)
+     char *path;
+     int where;
+{
+  int len;
+
+  if (!infopath)
+    {
+      infopath = (char *)xmalloc (infopath_size = 200 + strlen (path));
+      infopath[0] = '\0';
+    }
+
+  len = strlen (path) + strlen (infopath);
+
+  if (len + 2 >= infopath_size)
+    infopath = (char *)xrealloc (infopath, (infopath_size += (2 * len) + 2));
+
+  if (!*infopath)
+    strcpy (infopath, path);
+  else if (where == INFOPATH_APPEND)
+    {
+      strcat (infopath, ":");
+      strcat (infopath, path);
+    }
+  else if (where == INFOPATH_PREPEND)
+    {
+      char *temp = savestring (infopath);
+      strcpy (infopath, path);
+      strcat (infopath, ":");
+      strcat (infopath, temp);
+      free (temp);
+    }
+}
+
+/* Make INFOPATH have absolutely nothing in it. */
+void
+zap_infopath ()
+{
+  if (infopath)
+    free (infopath);
+
+  infopath = (char *)NULL;
+  infopath_size = 0;
+}
+
+/* Read the contents of PATHNAME, returning a buffer with the contents of
+   that file in it, and returning the size of that buffer in FILESIZE.
+   FINFO is a stat struct which has already been filled in by the caller.
+   If the file cannot be read, return a NULL pointer. */
+char *
+filesys_read_info_file (pathname, filesize, finfo)
+     char *pathname;
+     long *filesize;
+     struct stat *finfo;
+{
+  *filesize = filesys_error_number = 0;
+
+  if (compressed_filename_p (pathname))
+    return (filesys_read_compressed (pathname, filesize, finfo));
+  else
+    {
+      int descriptor;
+      char *contents;
+
+      descriptor = open (pathname, O_RDONLY, 0666);
+
+      /* If the file couldn't be opened, give up. */
+      if (descriptor < 0)
+	{
+	  filesys_error_number = errno;
+	  return ((char *)NULL);
+	}
+
+      /* Try to read the contents of this file. */
+      contents = (char *)xmalloc (1 + finfo->st_size);
+      if ((read (descriptor, contents, finfo->st_size)) != finfo->st_size)
+	{
+	  filesys_error_number = errno;
+	  close (descriptor);
+	  free (contents);
+	  return ((char *)NULL);
+	}
+
+      close (descriptor);
+
+      *filesize = finfo->st_size;
+      return (contents);
+    }
+}
+
+/* Typically, pipe buffers are 4k. */
+#define BASIC_PIPE_BUFFER (4 * 1024)
+
+/* We use some large multiple of that. */
+#define FILESYS_PIPE_BUFFER_SIZE (16 * BASIC_PIPE_BUFFER)
+
+char *
+filesys_read_compressed (pathname, filesize, finfo)
+     char *pathname;
+     long *filesize;
+     struct stat *finfo;
+{
+  FILE *stream;
+  char *command, *decompressor;
+  char *contents = (char *)NULL;
+
+  *filesize = filesys_error_number = 0;
+
+  decompressor = filesys_decompressor_for_file (pathname);
+
+  if (!decompressor)
+    return ((char *)NULL);
+
+  command = (char *)xmalloc (10 + strlen (pathname) + strlen (decompressor));
+  sprintf (command, "%s < %s", decompressor, pathname);
+
+#if !defined (BUILDING_LIBRARY)
+  if (info_windows_initialized_p)
+    {
+      char *temp;
+
+      temp = (char *)xmalloc (5 + strlen (command));
+      sprintf (temp, "%s...", command);
+      message_in_echo_area ("%s", temp);
+      free (temp);
+    }
+#endif /* !BUILDING_LIBRARY */
+
+  stream = popen (command, "r");
+  free (command);
+
+  /* Read chunks from this file until there are none left to read. */
+  if (stream)
+    {
+      int offset, size;
+      char *chunk;
+    
+      offset = size = 0;
+      chunk = (char *)xmalloc (FILESYS_PIPE_BUFFER_SIZE);
+
+      while (1)
+	{
+	  int bytes_read;
+
+	  bytes_read = fread (chunk, 1, FILESYS_PIPE_BUFFER_SIZE, stream);
+
+	  if (bytes_read + offset >= size)
+	    contents = (char *)xrealloc
+	      (contents, size += (2 * FILESYS_PIPE_BUFFER_SIZE));
+
+	  memcpy (contents + offset, chunk, bytes_read);
+	  offset += bytes_read;
+	  if (bytes_read != FILESYS_PIPE_BUFFER_SIZE)
+	    break;
+	}
+
+      free (chunk);
+      pclose (stream);
+      contents = (char *)xrealloc (contents, offset + 1);
+      *filesize = offset;
+    }
+  else
+    {
+      filesys_error_number = errno;
+    }
+
+#if !defined (BUILDING_LIBARARY)
+  if (info_windows_initialized_p)
+    unmessage_in_echo_area ();
+#endif /* !BUILDING_LIBRARY */
+  return (contents);
+}
+
+/* Return non-zero if FILENAME belongs to a compressed file. */
+int
+compressed_filename_p (filename)
+     char *filename;
+{
+  char *decompressor;
+
+  /* Find the final extension of this filename, and see if it matches one
+     of our known ones. */
+  decompressor = filesys_decompressor_for_file (filename);
+
+  if (decompressor)
+    return (1);
+  else
+    return (0);
+}
+
+/* Return the command string that would be used to decompress FILENAME. */
+char *
+filesys_decompressor_for_file (filename)
+     char *filename;
+{
+  register int i;
+  char *extension = (char *)NULL;
+
+  /* Find the final extension of FILENAME, and see if it appears in our
+     list of known compression extensions. */
+  for (i = strlen (filename) - 1; i > 0; i--)
+    if (filename[i] == '.')
+      {
+	extension = filename + i;
+	break;
+      }
+
+  if (!extension)
+    return ((char *)NULL);
+
+  for (i = 0; compress_suffixes[i].suffix; i++)
+    if (strcmp (extension, compress_suffixes[i].suffix) == 0)
+      return (compress_suffixes[i].decompressor);
+
+  return ((char *)NULL);
+}
+
+/* The number of the most recent file system error. */
+int filesys_error_number = 0;
+
+#if !defined (HAVE_STRERROR)
+extern char *sys_errlist[];
+extern int sys_nerr;
+
+char *
+strerror (num)
+     int num;
+{
+  if (num >= sys_nerr)
+    return ("");
+  else
+    return (sys_errlist[num]);
+}
+#endif /* !HAVE_STRERROR */
+
+/* A function which returns a pointer to a static buffer containing
+   an error message for FILENAME and ERROR_NUM. */
+static char *errmsg_buf = (char *)NULL;
+static int errmsg_buf_size = 0;
+
+char *
+filesys_error_string (filename, error_num)
+     char *filename;
+     int error_num;
+{
+  int len;
+  char *result;
+
+  if (error_num == 0)
+    return ((char *)NULL);
+
+  result = strerror (error_num);
+
+  len = 4 + strlen (filename) + strlen (result);
+  if (len >= errmsg_buf_size)
+    errmsg_buf = (char *)xrealloc (errmsg_buf, (errmsg_buf_size = 2 + len));
+
+  sprintf (errmsg_buf, "%s: %s", filename, result);
+  return (errmsg_buf);
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/filesys.h	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,84 @@
+/* filesys.h -- External declarations of functions and vars in filesys.c. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#if !defined (_FILESYS_H_)
+#define _FILESYS_H_
+
+/* The path on which we look for info files.  You can initialize this
+   from the environment variable INFOPATH if there is one, or you can
+   call info_add_path () to add paths to the beginning or end of it. */
+extern char *infopath;
+
+/* Make INFOPATH have absolutely nothing in it. */
+extern void zap_infopath ();
+
+/* Add PATH to the list of paths found in INFOPATH.  2nd argument says
+   whether to put PATH at the front or end of INFOPATH. */
+extern void info_add_path ();
+
+/* Defines that are passed along with the pathname to info_add_path (). */
+#define INFOPATH_PREPEND 0
+#define INFOPATH_APPEND  1
+
+/* Expand the filename in PARTIAL to make a real name for this operating
+   system.  This looks in INFO_PATHS in order to find the correct file.
+   If it can't find the file, it returns NULL. */
+extern char *info_find_fullpath ();
+
+/* Read the contents of PATHNAME, returning a buffer with the contents of
+   that file in it, and returning the size of that buffer in FILESIZE.
+   FINFO is a stat struct which has already been filled in by the caller.
+   If the file cannot be read, return a NULL pointer. */
+extern char *filesys_read_info_file ();
+extern char *filesys_read_compressed ();
+
+/* Return the command string that would be used to decompress FILENAME. */
+extern char *filesys_decompressor_for_file ();
+extern int compressed_filename_p ();
+
+/* A function which returns a pointer to a static buffer containing
+   an error message for FILENAME and ERROR_NUM. */
+extern char *filesys_error_string ();
+
+/* The number of the most recent file system error. */
+extern int filesys_error_number;
+
+/* Given a string containing units of information separated by colons,
+   return the next one pointed to by IDX, or NULL if there are no more.
+   Advance IDX to the character after the colon. */
+extern char *extract_colon_unit ();
+
+/* The default value of INFOPATH. */
+#if !defined (DEFAULT_INFOPATH)
+#  define DEFAULT_INFOPATH "/usr/gnu/info:/local/gnu/info:/usr/gnu/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
+#endif /* !DEFAULT_INFOPATH */
+
+#if !defined (S_ISREG) && defined (S_IFREG)
+#  define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif /* !S_ISREG && S_IFREG */
+
+#if !defined (S_ISDIR) && defined (S_IFDIR)
+#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif /* !S_ISDIR && S_IFDIR */
+
+#endif /* !_FILESYS_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/info/footnotes.c	Thu Oct 21 22:39:46 1993 +0000
@@ -0,0 +1,264 @@
+/* footnotes.c -- Some functions for manipulating footnotes. */
+
+/* This file is part of GNU Info, a program for reading online documentation
+   stored in Info format.
+
+   Copyright (C) 1993 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   Written by Brian Fox (bfox@ai.mit.edu). */
+
+#include "info.h"
+
+/* Non-zero means attempt to show footnotes when displaying a new window. */
+int auto_footnotes_p = 1;
+
+static char *footnote_nodename = "*Footnotes*";
+
+#define FOOTNOTE_HEADER_FORMAT \
+   "*** Footnotes appearing in the node \"%s\" ***\n"
+
+/* Find the window currently showing footnotes. */
+static WINDOW *
+find_footnotes_window ()
+{
+  WINDOW *win;
+
+  /* Try to find an existing window first. */
+  for (win = windows; win; win = win->next)
+    if (internal_info_node_p (win->node) &&
+	(strcmp (win->node->nodename, footnote_nodename) == 0))
+      break;
+
+  return (win);
+}
+
+/* Manufacture a node containing the footnotes of this node, and
+   return the manufactured node.  If NODE has no footnotes, return a 
+   NULL pointer. */
+NODE *
+make_footnotes_node (node)
+     NODE *node;
+{
+  NODE *fn_node, *result = (NODE *)NULL;
+  long fn_start;
+
+  /* Make the initial assumption that the footnotes appear as simple
+     text within this windows node. */
+  fn_node = node;
+
+  /* See if this node contains the magic footnote label. */
+  fn_start =
+    info_search_in_node (FOOTNOTE_LABEL, node, 0, (WINDOW *)NULL, 1);
+
+  /* If it doesn't, check to see if it has an associated footnotes node. */
+  if (fn_start == -1)
+    {
+      REFERENCE **refs;
+
+      refs = info_xrefs_of_node (node);
+
+      if (refs)
+	{
+	  register int i;
+	  char *refname;
+
+	  refname = (char *)xmalloc
+	    (1 + strlen ("-Footnotes") + strlen (node->nodename));
+
+	  strcpy (refname, node->nodename);
+	  strcat (refname, "-Footnotes");
+
+	  for (i = 0; refs[i]; i++)
+	    if (strcmp (refs[i]->nodename, refname) == 0)
+	      {
+		char *filename;
+
+		filename = node->parent;
+		if (!filename)
+		  filename = node->filename;
+
+		fn_node = info_get_node (filename, refname);
+
+		if (fn_node)
+		  fn_start = 0;
+
+		break;
+	      }
+
+	  free (refname);
+	  info_free_references (refs);
+	}
+    }
+
+  /* If we never found the start of a footnotes area, quit now. */
+  if (fn_start == -1)
+    return ((NODE *)NULL);
+
+  /* Make the new node. */
+  result = (NODE *)xmalloc (sizeof (NODE));
+  result->flags = 0;
+
+  /* Get the size of the footnotes appearing within this node. */
+  {
+    char *header;
+    long text_start = fn_start;
+
+    header = (char *)xmalloc
+      (1 + strlen (node->nodename) + strlen (FOOTNOTE_HEADER_FORMAT));
+    sprintf (header, FOOTNOTE_HEADER_FORMAT, node->nodename);
+
+    /* Move the start of the displayed text to right after the first line.
+       This effectively skips either "---- footno...", or "File: foo...". */
+    while (text_start < fn_node->nodelen)
+      if (fn_node->contents[text_start++] == '\n')
+	break;
+  
+    result->nodelen = strlen (header) + fn_node->nodelen - text_start;
+
+    /* Set the contents of this node. */
+    result->contents = (char *)xmalloc (1 + result->nodelen);
+    sprintf (result->contents, "%s", header);
+    memcpy (result->contents + strlen (header),
+	    fn_node->contents + text_start, fn_node->nodelen - text_start);
+
+    name_internal_node (result, footnote_nodename);
+    free (header);
+  }
+
+#if defined (NOTDEF)
+  /* If the footnotes were gleaned from the node that we were called with,
+     shorten the calling node's display length. */
+  if (fn_node == node)
+    narrow_node (node, 0, fn_start);
+#endif /* NOTDEF */
+
+  return (result);
+}
+
+/* Create or delete the footnotes window depending on whether footnotes
+   exist in WINDOW's node or not.  Returns FN_FOUND if footnotes were found
+   and displayed.  Returns FN_UNFOUND if there were no footnotes found
+   in WINDOW's node.  Returns FN_UNABLE if there were footnotes, but the
+   window to show them couldn't be made. */
+int
+info_get_or_remove_footnotes (window)
+     WINDOW *window;
+{
+  WINDOW *fn_win;
+  NODE *new_footnotes;
+
+  fn_win = find_footnotes_window ();
+
+  /* If we are in the footnotes window, change nothing. */
+  if (fn_win == window)
+    return (FN_FOUND);
+
+  /* Try to find footnotes for this window's node. */
+  new_footnotes = make_footnotes_node (window->node);
+
+  /* If there was a window showing footnotes, and there are no footnotes
+     for the current window, delete the old footnote window. */
+  if (fn_win && !new_footnotes)
+    {
+      if (windows->next)
+	info_delete_window_internal (fn_win);
+    }
+
+  /* If there are footnotes for this window's node, but no window around
+     showing footnotes, try to make a new window. */
+  if (new_footnotes && !fn_win)
+    {
+      WINDOW *old_active;
+      WINDOW *last, *win;
+
+      /* Always make this window be the last one appearing in the list.  Find
+	 the last window in the chain. */
+      for (win = windows, last = windows; win; last = win, win = win->next);
+
+      /* Try to split this window, and make the split window the one to
+	 contain the footnotes. */
+      old_active = active_window;
+      active_window = last;
+      fn_win = window_make_window (new_footnotes);
+      active_window = old_active;
+
+      if (!fn_win)
+	{
+	  free (new_footnotes->contents);
+	  free (new_footnotes);
+
+	  /* If we are hacking automatic footnotes, and there are footnotes
+	     but we couldn't display them, print a message to that effect. */
+	  if (auto_footnotes_p)
+	    inform_in_echo_area ("Footnotes could not be displayed");
+	  return (FN_UNABLE);
+	}
+    }
+
+  /* If there are footnotes, and there is a window to display them,
+     make that window be the number of lines appearing in the footnotes. */
+  if (new_footnotes && fn_win)
+    {
+      window_set_node_of_window (fn_win, new_footnotes);
+
+      window_change_window_height
+	(fn_win, fn_win->line_count - fn_win->height);
+
+      remember_window_and_node (fn_win, new_footnotes);
+      add_gcable_pointer (new_footnotes->contents);
+    }
+
+  if (!new_footnotes)
+    return (FN_UNFOUND);
+  else
+    return (FN_FOUND);
+}
+
+/* Show the footnotes associated with this node in another window. */
+DECLARE_INFO_COMMAND (info_show_footnotes,
+   "Show the footnotes associated with this node in another window")
+{
+  int result;
+
+  /* A negative argument means just make the window go away. */
+  if (count < 0)
+    {
+      WINDOW *fn_win = find_footnotes_window ();
+
+      /* If there is an old footnotes window, and it isn't the only window
+	 on the screen, delete it. */
+      if (fn_win && windows->next)
+	info_delete_window_internal (fn_win);
+    }
+  else
+    {
+      int result;
+
+      result = info_get_or_remove_footnotes (window);
+
+      switch (result)
+	{
+	case FN_UNFOUND:
+	  info_error (NO_FOOT_NODE);
+	  break;
+
+	case FN_UNABLE:
+	  info_error (WIN_TOO_SMALL);
+	  break;
+	}
+    }
+}