--- a/readline/CHANGELOG
+++ b/readline/CHANGELOG
@@ -454,3 +454,12 @@
 doc/Makefile.in
 	- rules to install and uninstall history.3 in ${man3dir}
 	- rules to build history.0 and history_3.ps
+
+				    4/2
+				    ---
+configure.in
+	- changed LIBVERSION to `4.2'
+
+				    4/5
+				    ---
+[readline-4.2 frozen]

--- a/readline/CHANGES
+++ b/readline/CHANGES
@@ -95,9 +95,14 @@
 dd. Fixed a bug that could cause applications to dereference a NULL pointer
     if a NULL second argument was passed to history_expand().
 
+ee. If a hook function assigned to rl_event_hook sets rl_done to a non-zero
+    value, rl_read_key() now immediately returns '\n' (which is assumed to   
+    be bound to accept-line).
+
 2.  New Features in Readline
 
-a.  The blink timeout for paren matching is now settable by applications.
+a.  The blink timeout for paren matching is now settable by applications,
+    via the rl_set_paren_blink_timeout() function.
 
 b.  _rl_executing_macro has been renamed to rl_executing_macro, which means
     it's now part of the public interface.

--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-19  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Update to readline-4.2.
+
 2001-03-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (install, uninstall): For Octave, do nothing.

--- a/readline/README
+++ b/readline/README
@@ -37,6 +37,9 @@
 The file rlconf.h contains C preprocessor defines that enable and disable
 certain Readline features.
 
+The special make target `everything' will build the static and shared
+libraries (if the target platform supports them) and the examples.
+
 Examples
 ========
 
@@ -64,8 +67,8 @@
 If you need to update support/shobj-conf, you will need to create
 a `stanza' for your operating system and compiler.  The script uses
 the value of host_os and ${CC} as determined by configure.  For
-instance, FreeBSD 2.2.5 with any version of gcc is identified as
-`freebsd2.2.5-gcc*'.
+instance, FreeBSD 4.2 using the ELF object file format  with any
+version of gcc is identified as `freebsdelf4.2-gcc*'.
 
 In the stanza for your operating system-compiler pair, you will need to
 define several variables.  They are:
@@ -144,7 +147,7 @@
 
 When reporting a bug, please include the following information:
 
-        * the version number and release status of Readline (e.g., 4.0-release)
+        * the version number and release status of Readline (e.g., 4.2-release)
         * the machine and OS that it is running on
         * a list of the compilation flags or the contents of `config.h', if
           appropriate

--- a/readline/configure.in
+++ b/readline/configure.in
@@ -4,8 +4,8 @@
 dnl report bugs to chet@po.cwru.edu
 dnl
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION([for Readline 4.2, version 2.25, from autoconf version] AC_ACVERSION)
-LIBVERSION=4.2-beta
+AC_REVISION([for Readline 4.2, version 2.26, from autoconf version] AC_ACVERSION)
+LIBVERSION=4.2
 
 AC_INIT(readline.h)
 AC_CONFIG_HEADER(config.h)

--- a/readline/doc/hstech.texinfo
+++ b/readline/doc/hstech.texinfo
@@ -423,7 +423,7 @@
 
 @deftypevar {char *} history_word_delimiters
 The characters that separate tokens for \fBhistory_tokenize()\fP.
-The default value is @code{" \t\n()<>;&|$"}.
+The default value is @code{" \t\n()<>;&|"}.
 @end deftypevar
 
 @deftypevar {char *} history_no_expand_chars

--- a/readline/doc/manvers.texinfo
+++ b/readline/doc/manvers.texinfo
@@ -1,6 +1,6 @@
-@set EDITION 4.2-beta
-@set VERSION 4.2-beta
-@set UPDATED 2001 Mar 6
-@set UPDATE-MONTH Mar 2001
+@set EDITION 4.2
+@set VERSION 4.2
+@set UPDATED 2001 Apr 16
+@set UPDATE-MONTH Apr 2001
 
-@set LASTCHANGE Tue Mar  6 13:25:07 EST 2001
+@set LASTCHANGE Mon Apr 16 10:53:58 EDT 2001

--- a/readline/doc/rltech.texinfo
+++ b/readline/doc/rltech.texinfo
@@ -505,7 +505,7 @@
 
 @deftypevar {int} rl_editing_mode
 Set to a value denoting Readline's current editing mode.  A value of
-@var{emacs_mode} means Readline is currently in emacs mode; @var{vi_mode}
+@var{1} means Readline is currently in emacs mode; @var{0}
 means that vi mode is active.
 @end deftypevar
 
@@ -527,6 +527,7 @@
 * Utility Functions::	Generally useful functions and hooks.
 * Miscellaneous Functions::	Functions that don't fall into any category.
 * Alternate Interface::	Using Readline in a `callback' fashion.
+* A Readline Example::		An example Readline function.
 @end menu
 
 @node Function Naming
@@ -916,6 +917,8 @@
 This handles input inserted into
 the input stream via @var{rl_pending_input} (@pxref{Readline Variables})
 and @code{rl_stuff_char()}, macros, and characters read from the keyboard.
+While waiting for input, this function will call any function assigned to
+the @code{rl_event_hook} variable.
 @end deftypefun
 
 @deftypefun int rl_getc (FILE *stream)
@@ -940,6 +943,13 @@
 pending input has not already been read with @code{rl_read_key()}.
 @end deftypefun
 
+@deftypefun int rl_set_keyboard_input_timeout (int u)
+While waiting for keyboard input in @code{rl_read_key()}, Readline will
+wait for @var{u} microseconds for input before calling any function
+assigned to @code{rl_event_hook}.  The default waiting period is
+one-tenth of a second.  Returns the old timeout value.
+@end deftypefun
+
 @node Terminal Management
 @subsection Terminal Management
 
@@ -1061,6 +1071,11 @@
 that it can be made part of an @code{inputrc} file and re-read.
 @end deftypefun
 
+@deftypefun int rl_set_paren_blink_timeout (int u)
+Set the time interval (in microseconds) that Readline waits when showing
+a balancing character when @code{blink-matching-paren} has been enabled.
+@end deftypefun
+
 @node Alternate Interface
 @subsection Alternate Interface
 
@@ -1093,7 +1108,8 @@
 This may be called from within a callback as well as independently.
 @end deftypefun
 
-@subsection An Example
+@node A Readline Example
+@subsection A Readline Example
 
 Here is a function which changes lowercase characters to their uppercase
 equivalents, and uppercase characters to lowercase.  If

--- a/readline/examples/Makefile.in
+++ b/readline/examples/Makefile.in
@@ -70,6 +70,7 @@
 clean mostlyclean:
 	$(RM) $(OBJECTS)
 	$(RM) $(EXECUTABLES) *.exe
+	$(RM) rlfe.o rlfe
 
 distclean maintainer-clean: clean
 	$(RM) Makefile

--- a/readline/input.c
+++ b/readline/input.c
@@ -366,6 +366,8 @@
 	  while (rl_event_hook && rl_get_char (&c) == 0)
 	    {
 	      (*rl_event_hook) ();
+	      if (rl_done)		/* XXX - experimental */
+		return ('\n');
 	      rl_gather_tyi ();
 	    }
 	}

--- a/readline/readline.c
+++ b/readline/readline.c
@@ -67,7 +67,7 @@
 #include "xmalloc.h"
 
 #ifndef RL_LIBRARY_VERSION
-#  define RL_LIBRARY_VERSION "4.2-beta"
+#  define RL_LIBRARY_VERSION "4.2"
 #endif
 
 /* Evaluates its arguments multiple times. */

--- a/readline/readline.h
+++ b/readline/readline.h
@@ -350,8 +350,9 @@
 extern int rl_message ();
 #endif
 
+extern int rl_show_char __P((int));
+
 /* Undocumented in texinfo manual. */
-extern int rl_show_char __P((int));
 extern int rl_character_len __P((int, int));
 
 /* Save and restore internal prompt redisplay information. */