# ------------------------------------------------------------------------------
#  CHANGES                                |  139 +++-
#  INSTALLATION                           |    5 
#  WWW/Library/Implementation/HTAAProt.c  |    4 
#  WWW/Library/Implementation/HTAAUtil.h  |   16 
#  WWW/Library/Implementation/HTAccess.c  |    6 
#  WWW/Library/Implementation/HTMIME.c    |   55 -
#  WWW/Library/Implementation/HTUtils.h   |    6 
#  WWW/Library/Implementation/SGML.c      |   16 
#  WWW/Library/vms/descrip.mms            |   10 
#  config.hin                             |    1 
#  configure                              |  875 +++++++++++++++----------------
#  configure.in                           |   12 
#  lynx.cfg                               |    8 
#  lynx_help/Lynx_users_guide.html        |    8 
#  lynx_help/about_lynx.html              |    4 
#  lynx_help/keystrokes/environments.html |    2 
#  lynx_help/keystrokes/follow_help.html  |    2 
#  lynx_help/keystrokes/test_display.html |    2 
#  lynx_help/lynx-dev.html                |   60 +-
#  lynx_help/lynx_url_support.html        |   10 
#  po/POTFILES.in                         |    4 
#  po/lynx.pot                            |  335 ++++++-----
#  src/HTML.c                             |   33 -
#  src/LYBookmark.c                       |   33 -
#  src/LYCgi.c                            |    2 
#  src/LYCharUtils.c                      |    2 
#  src/LYCookie.c                         |   37 -
#  src/LYDownload.c                       |    2 
#  src/LYGetFile.c                        |    8 
#  src/LYHistory.c                        |   30 -
#  src/LYList.c                           |   16 
#  src/LYLocal.c                          |    6 
#  src/LYMail.c                           |    5 
#  src/LYMain.c                           |   14 
#  src/LYMainLoop.c                       |   32 +
#  src/LYMap.c                            |   32 -
#  src/LYOptions.c                        |   11 
#  src/LYPrettySrc.c                      |    4 
#  src/LYPrettySrc.h                      |    3 
#  src/LYReadCFG.c                        |   41 +
#  src/LYStrings.c                        |    8 
#  src/LYStyle.c                          |    8 
#  src/LYUtils.c                          |    4 
#  src/LYUtils.h                          |    2 
#  src/LYrcFile.c                         |    2 
#  src/makefile.in                        |    3 
#  test/sgml.html                         |    6 
#  test/unicode.html                      |    6 
#  userdefs.h                             |   33 -
#  49 files changed, 1068 insertions, 895 deletions
# ------------------------------------------------------------------------------
Index: CHANGES
--- 2.8.2dev.25/CHANGES	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/CHANGES	Wed May  5 18:33:59 1999
@@ -1,7 +1,66 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+1999-05-05 (2.8.2dev.26 - 2.8.2pre.1)
+* remove some weird cruft from HTAAUtil.h (yeah, "/home2/luotonen" is a good
+  default path) (John Bley)
+* correct a buffer overflow in LYDownload.c (reported by John Bley) -TD
+* 8bit attribute values are now translated in psrc view (reported by LP) -VH
+* trailing ';' now is shown after HTML entities (reported by LP) -VH
+* split-up/correct typo in text at top of generated bookmark file -JS, -TD
+* allow anchors as input for commands 'g','G','E' -VH
+* correct off-by-one error in pointer to filename in DOSPATH configuration for
+  LYPathLeaf() -DK
+* fix infinite recursion bug in lynx.cfg includes, from dev.25 integraton
+  (reported by LP) -VH
+* implement the following separators in lynx.cfg "include" commands:
+  ":" on Unix
+  " for " on all OS's -VH
+* fixes for LYList.c,  adding title info to the (mostly unused) HTLinkType -KW
+* change remaining <banner>'s to <blockquote> in other html files, fix
+  a few escapes that tidy (15-apr-99) reports.  Leaving <tab>'s alone for the
+  moment because there appears to be no standard equivalent -TD
+* change <banner> in lynx-dev.html to <blockquote> since the latter is
+  standard, correct IEFT version and supply <p>'s as needed (Karl Eichwalder)
+* correct a couple of two documentation inconsistencies in the sources for
+  USE_PSRC and -prettysrc (Karl Eichwalder <ke@gnu.franken.de>)
+* register free_messages_stack with atexit to fix some statusline leakage,
+  explicitly fill out a struct initializer (John Bley)
+* fix a few html nits in the docs (John Bley)
+* cleanup some gcc -Wundef warnings -TD
+* add logic to free_lynx_cfg() to unset environment variables (requested by
+  LP) -TD
+* modify SafeHTUnEscape() to work with EBCDIC (pg@sweng.stortek.com)
+* remove dangling comma in UrlTypes enum (reported by pg@sweng.stortek.com) -TD
+* make description of STARTFILE in userdefs.h agree with lynx.cfg -TD
+* fix:  newline position when we come from the history stack and cached HText
+  is used (say, return from 'p'rint menu), was broken in dev23 -LP
+* remove numerous HTMLSetCharacterHandling() calls from getfile(), use single
+  call in mainloop instead -LP
+* #define PUTS() in LYCookie.c and LYMap.c to make code more readable -LP
+* fix:  LYmouse_menu() in LYStrings.c calls popup_choice(), which is #ifdef'd
+  out when --disable-menu-options is used (patch by Sergey Svishchev)
+* modify generated src/makefile to omit include from intl directory if it is
+  not used.  This in turn required fixing a redefinition of gettext on Solaris
+  when using cc, since the locale.h file includes Sun's libintl.h file which
+  prototypes gettext.  Successfully built/ran using Sun's msgfmt utility, (had
+  to manually add -lintl to src/makefile) though the generated message objects
+  are incompatible, resulting in a core dump if not reinstalled (unnecessary
+  include reported by LP) -TD
+* change VMS WWW descrip.mms file to use prefix=all rather than prefix=ansi, so
+  that POSIX functions such as 'read()' are linked properly (reported by Andy
+  Harper) this is a detail I overlooked in dev.18 -TD
+* fixes to compile with SunOS K&R cc -TD
 1999-04-27 (2.8.2dev.25)
+* fix reload_read_cfg() to avoid persistent cookies mode changing at run time;
+  reload printers list, downloaders list, environments - as expected. - LP
+* fixes for SOURCE_CACHE!=NONE mode, trying to accomodate HTreparse_document()
+  for mainloop() events:
+  - add/use flag "from_source_cache" for better mainloop maintenance
+  - add partial display mode for HTreparse_document() operations
+  - add warning when the reparsed document may lost its forms content
+  - fix options menu staff to use HTreparse_document() when possible - LP
+* fix exit from postoptions() when the reloaded document was in source mode - LP
 * updates to INSTALLATION -HN
 * undo some redundant dev23 changes, in particular the absence of first
   PSRC_TEST responsible for a wrong line breaking in -prettysrc mode (try "lynx
@@ -60,7 +119,7 @@
 	SUFFIX VIEWER INCLUDE
 * change the STARTFILE description in lynx.cfg to offer the user's home
   directory as an alternative to lynx.browser.org (amended this to reflect
-  consensus that l.b.o should be the default -TD) - PW
+  consensus that l.b.o should be the default) -TD
 * move a big chunk of code into print_status_message() -LP
 * also add numerous HTProgress messages to LYNXMESSAGES:/ page (but not
   HTReadProgress) -LP
@@ -69,7 +128,7 @@
   This allows us to decrease the messages delay in lynx.cfg when we feel
   messages too annoying, but have a nice history list for diagnostic purposes.
   Uses a 40-line buffer (suggested by Bela Lubkin) -LP
-* Fix reloading with HTreparse_document() for LYK_MINIMAL, LYK_HISTORICAL,
+* fix reloading with HTreparse_document() for LYK_MINIMAL, LYK_HISTORICAL,
   LYK_SOFT_DQUOTES, LYK_SWITCH_DTD mainloop events (hope we work around replies
   from POST properly) -LP
 * elaborate description in Lynx_users_guide.html for "comments" (Michael
@@ -221,17 +280,17 @@
   is located not on the 1st page.  IMO this is something with style stack.  If
   this will be fixed, then keeping of Style_className:HTML.c can be omitted
   again -VH
-* Fixed the bug in lynx with lss support -when displaying html pieces such as
+* fixed the bug in lynx with lss support -when displaying html pieces such as
   <b> A <b> B </b> C </b>, only 'AB' was drawn in style corresponding to <b>
   -VH
 * added HTML source syntax highlighting (when option -prettysrc that is added
   is given to lynx). It's available for lynx compiled with and without lss
   support (it can be much more beatiful when compiled with lss support - read
-  lynx.cfg for description). The code is ifdef'ed with USE_SRC.
+  lynx.cfg for description). The code is ifdef'ed with USE_PSRC.
   This functionality coexists with old source view and with -preparsed logic
   (ie different commandline options make source view logic different) -VH
 * HTChunkPutc was inlined in SGML.c for better performance -VH
-* Keeping of Style_className was omitted in HTML.c to increase performance of
+* keeping of Style_className was omitted in HTML.c to increase performance of
   lynx compiled with lss support. -VH
 * perfomance of lynx compiled with lss support is increased ~ by 15-20% for
   normal documents, and by up to 50% for documents with a lot of tags VH
@@ -260,13 +319,13 @@
   + ifdef'd use of lynx_version_putenv_command in LYMain.c
   + correct spurious parenthesis in mailform function
   + correct missing COPY_PATH definition for LYUtils.c
-* Check for 'z' user interrupt in HTLoadHTTP before setting up the output
+* check for 'z' user interrupt in HTLoadHTTP before setting up the output
   stream.  This avoids doing unnecessary work, including possible creation of a
   new HText structure that most likely is never displayed but still pushes
   another document out of the.  cache.  Most commonly this occurs when a HTTP
   error response is received and the user presses 'z' while the resulting alert
   message is shown - KW
-* Fix of HTUnEscapeSome in HTParse.c for non-ASCII - KW, PG
+* fix of HTUnEscapeSome in HTParse.c for non-ASCII - KW, PG
 * tidy up around ed_offset initialization in GridText.c - KED
   (the patch as given did not compile on a non-ANSI compiler because it used
   aggregate initialization - TD)
@@ -363,7 +422,7 @@
 * remove some unnecessary use of dynamic buffers where there is no apparent
   benefit for using them, for the sake of performance or to avoid a minor
   memory leak - KW
-* Stuffed small memory leak (MultipartContentType) - KW
+* stuffed small memory leak (MultipartContentType) - KW
 * absorb 'len' parameter into logic of argncmp, so it still achieves its
   purpose of comparing prefixes of options without undue maintenance effort -TD
 * retain logic that uses final URL on command-line (request by KW) - TD
@@ -387,7 +446,7 @@
   mode.  Also show mode as "source" instead of "normal" if viewing SOURCE, in
   all user modes - KW
 * minor FASTBACKW_LINK / FASTFORW_LINK tweaks - KW
-* Removed documentation for nonimplemented chargen URLs - KW
+* removed documentation for nonimplemented chargen URLs - KW
 * remove num_n256 hack introduced in dev18 UCDomap.* - LP
 * forms-based options menu: fix reloading of previous document *only* when
   necessary (was always, since early forms-based options menu days).  Still
@@ -639,7 +698,7 @@
 * minor documentation tweaks for EDITTEXTAREA - LP
 * correct uninitalized buffer variable in send_file_to_mail() which caused
   core dump (reported by LV) - KW
-* Recognize Subject and Message-Id in embedded comments in HTML documents, in
+* recognize Subject and Message-Id in embedded comments in HTML documents, in
   the form generated by MHonArc for mailing list archives (including lynx-dev).
   Use these to generate a default Subject and an In-Reply-To header (currently
   not for VMS) when replying by mail (sending a 'C'omment, or following a
@@ -648,7 +707,7 @@
   apply very rarely.  If no suitable comment strings are found or they are
   regarded as invalid (bad characters, not exactly right format) they are not
   used, and the fallback (URL as Subject, no In-Reply-To) applies - KW
-* Use the Message-Id of a news article to generate a References header when
+* use the Message-Id of a news article to generate a References header when
   posting a reply.  Lynx's new article listing doesn't understand threading,
   but this is nicer for other newsreader that do.  The References header of the
   referenced article is not used, so there will be only one message-id in the
@@ -667,14 +726,14 @@
   especially for message-ids.) Recognize special meaning of "Followup-to:
   poster" (don't treat "poster" as a newsgroup name).  Other small tweaks - KW
 * add samples/cernrules.txt - KW
-* Except for DJGPP, move lookup code for domain names (not dotted-quad IP
+* except for DJGPP, move lookup code for domain names (not dotted-quad IP
   addresses) from HTParseInet into a new function:  LYGetHostByName acts like
   the normal gethostbyname, but includes the NSL_FORK logic.  Interruption is
   indicated in global variable lynx_nsl_status - KW
-* Use LYGetHostByName instead of HTParseInet for URL guessing - KW
-* Select on tty file descriptor in NSL_FORK loop also if compiled with slang.
+* use LYGetHostByName instead of HTParseInet for URL guessing - KW
+* select on tty file descriptor in NSL_FORK loop also if compiled with slang.
   This should make 'z' during lookup more responsive - KW
-* Don't compile in the rules implementation code if NO_RULES is defined
+* don't compile in the rules implementation code if NO_RULES is defined
   (suggested by BL) - KW
 * fix special case of EDITTEXTAREA where the returned file is empty - BJP
 * write to .lynxrc values for COOKIE_ACCEPT_DOMAINS and COOKIE_REJECT_DOMAIN
@@ -847,23 +906,23 @@
   code to something somewhat like what was intended there.  But we don't have
   an "Other ISO Latin" display character set any more; maybe those `else'
   blocks should just have disappeared completely - KW
-* Minor changes to SortaSGML DTD for PARAM, THEAD - KW
-* Make "Alert" statusline prefix localizable - KW
-* Extend fixtext.sh to also change continued lines - KW
-* Changed LYCheckForProxyURL to act more like it appears to have been indended,
+* minor changes to SortaSGML DTD for PARAM, THEAD - KW
+* make "Alert" statusline prefix localizable - KW
+* extend fixtext.sh to also change continued lines - KW
+* changed LYCheckForProxyURL to act more like it appears to have been indended,
   and clarify comment.  Minor change in is_url - KW
-* Prevent removal of hidden link number from bookmark document in a very
+* prevent removal of hidden link number from bookmark document in a very
   obscure case of a bookmarked ISMAP link - KW
 * HText_SubmitForm:  make sure query is always allocated, even if the set of
   form fields to be sent turned out to be empty - KW
-* Some comments corrected in HTML.c, LYCharSets.c - KW
-* Tweak in curses_w_style for display without color - KW
-* Remove minor memory leak in LYDownload.c - KW
-* Changed error handling in LYTraversal.c to make sure terminal gets restored
+* some comments corrected in HTML.c, LYCharSets.c - KW
+* tweak in curses_w_style for display without color - KW
+* remove minor memory leak in LYDownload.c - KW
+* changed error handling in LYTraversal.c to make sure terminal gets restored
   to sane mode before showing error message and exiting - KW
-* Increased VALUE_SIZE for buffer in HTMIME.c from 1024 to 5120.  Someone
+* increased VALUE_SIZE for buffer in HTMIME.c from 1024 to 5120.  Someone
   needed increase for long Set-Cookie headers - KW
-* Two new functions in HTList.c to reverse and to combine lists - KW
+* two new functions in HTList.c to reverse and to combine lists - KW
 * Lynx was using the wrong precedence for entries within a mailcap (relative to
   other entries from the same file):  RFC 1524 says "The configuration
   information will be obtained from the FIRST matching entry in a mailcap
@@ -893,7 +952,7 @@
   Rather than put yet more DOS-specific makefiles in the distribution, I put
   the changes to the makefiles within comments, which can easily be removed to
   enable the changes - DK
-* Add a comment about LYUCcharset struct "UChndl" field.  Tweak trace
+* add a comment about LYUCcharset struct "UChndl" field.  Tweak trace
   messages - LP
 * fix parsing of ALT=value attribute when the value is not quoted.  When the
   first character is not us-ascii it was corrupted by chartrans in all versions
@@ -925,11 +984,11 @@
 * correct handling in getfile() of ~/ expansion - KW
 * modify NSL_FORK logic to prevent child process from running any signal
   handlers the parent may have installed - KW
-* The logic added to display_page for avoiding unnecessary screen redraw with
+* the logic added to display_page for avoiding unnecessary screen redraw with
   partial display (see 1998-12-03) is now disabled if enable_scrollback is set.
   Otherwise displayed pages could appear as empty (or with only the current
   link drawn) - KW
-* Modify conditions under which screen style cache is reset (only relevant for
+* modify conditions under which screen style cache is reset (only relevant for
   color style in combination with partial display) - KW
 * update the INSTALLATION file, reflecting the changes between the two DJGPP
   versions of GCC in use.  Also, change optimization to -O2 in the other two
@@ -966,14 +1025,14 @@
 * added a delete-to-beginning-of-line (for the alt bindings only), and a help
   page that describes the alternate bindings - KED
 * improved description of "HTML error tolerance" - KW
-* Changes for handling lynxcgi:  handle failure of execve(), by showing the
+* changes for handling lynxcgi:  handle failure of execve(), by showing the
   system error and then _exit()ing the child process.  Make sure REQUEST_METHOD
   is always set.  Added checks for EINTR and other errors from read() - KW
 * DOSPATH or EMX:  remove strange code dealing with root of local drive from
   is_url() and HTDOS_name()/HTDOS_wwwname(), add right code at the earlier
   stage in LYFillLocalFileURL() - LP (thanks KW)
-* Relax warning from HTAlert to HTUserMsg on REFRESH_URL_NOT_ABSOLUTE - LP
-* More tweaks on transfer rate calculation - LP
+* relax warning from HTAlert to HTUserMsg on REFRESH_URL_NOT_ABSOLUTE - LP
+* more tweaks on transfer rate calculation - LP
 * modify HTSACopy and HTSACat in case the source and destination are the same
   pointer - TD
 * tested/removed redundant OS/2 EMX adjustement to filename from LYEdit.c - TD
@@ -1138,19 +1197,19 @@
   HTAddParam, which broke telnet/rlogin URLs (reported by IC) - TD
 1998-12-12 (2.8.2dev.9)
 * change location-not-absolute message from an alert to user-message - TD
-* Check for EINTR from read() call in HTDoRead, and retry if necessary.  This
+* check for EINTR from read() call in HTDoRead, and retry if necessary.  This
   change only for Unix.  Interrupted read() system calls should be rare (or
   impossible, depending on the system implementation?) since the read() is only
   done after a successful select(), but checking can't hurt - KW
-* Check for read read() errors in HTDoRead and HTCopy, and generate alert
+* check for read read() errors in HTDoRead and HTCopy, and generate alert
   messages for unexpected errors.  HTCopy still returns HT_LOADED to indicate
   success if any data have been received before an unexpected error or
   disconnection.  Previously this happened without any indication to the user
   that something was wrong and a document or file might be incomplete.  These
   changes currently only for Unix - KW
-* Added/enhanced comments in HTFormat.c to document current behavior of HTCopy,
+* added/enhanced comments in HTFormat.c to document current behavior of HTCopy,
   HTFileCopy, HTGzFileCopy, HTParseSocket, HTParseFile, and HTParseGzFile - KW
-* Moved definition of HT_NO_DATA to HTUtils.h, changed value of some status
+* moved definition of HT_NO_DATA to HTUtils.h, changed value of some status
   codes to libwww5-like values while we're at it - KW
 * correct uninitialized de variable in LYCookie.c when dump_output_immediately
   is set.  Also, made a slight change to this mode in LYMain.c, so that cookies
@@ -1210,12 +1269,12 @@
   don't swallow space after number if line was split, find link number on
   previous line even it it is at the very end, adjust line split position after
   number removal.  Generate TRACE output in interesting cases - KW
-* Prevent havoc (access to already freed memory etc.) caused by multiple
+* prevent havoc (access to already freed memory etc.) caused by multiple
   recursive invocations of HTAnchor_delete on the same HTParentAnchor.  This
   does not seem to actually happen normally during a session, but can occur
   when the HTAnchor structures are cleaned up while handling a terminating
   signal or outofmem condition - KW
-* Reset the HTAnchor "underway" flag during final cleanup, so structures are
+* reset the HTAnchor "underway" flag during final cleanup, so structures are
   not prevented from being freed.  This also should only make a difference when
   handling a terminating signal or outofmem condition - KW
 * show sticky-bit in directory listings - LW
@@ -1251,9 +1310,9 @@
   information - KW
 * color styles:  reset screen style cache to avoid random coloring when a link
   is unhighlighted - KW
-* Tweak in HText_setLastOptionValue:  if an OPTION tag was directly followed by
+* tweak in HText_setLastOptionValue:  if an OPTION tag was directly followed by
   several newlines, characters could be dropped - KW
-* Tweak havevisible() function in LYBookmark.c to compare against Unicode
+* tweak havevisible() function in LYBookmark.c to compare against Unicode
   value rather than ASCII when checking for blanks. - LP
 * ifdef user/group function caching calls so that this builds with djgpp, which
   doesn't need/support this (patch by Gisle Vanem)
Index: INSTALLATION
--- 2.8.2dev.25/INSTALLATION	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/INSTALLATION	Wed May  5 18:33:59 1999
@@ -300,7 +300,10 @@
   --enable-default-colors		(define USE_DEFAULT_COLORS)
   	Enable use of default-color background (ncurses/slang).  Either
 	configuration supports the use of 'default' for colors even without
-	this option.
+	this option.  That is, 'default' is interpreted as white (foreground)
+	or black (background) according to the context.  When the default
+	colors configuration is built, the actual values for foreground and
+	background colors are determined by the terminal.
 
   --enable-exec-links			(define EXEC_LINKS)
 	Allows lynx to execute programs by accessing a link.
Index: WWW/Library/Implementation/HTAAProt.c
--- 2.8.2dev.25/WWW/Library/Implementation/HTAAProt.c	Tue Apr 13 03:39:16 1999
+++ 2.8.2dev.26/WWW/Library/Implementation/HTAAProt.c	Wed May  5 18:33:59 1999
@@ -601,7 +601,7 @@
 
 PRIVATE void save_gid_info ARGS2(char *, name, int, user)
 {
-    USER_DATA *data = calloc(1, sizeof(USER_DATA));
+    USER_DATA *data = (USER_DATA *)calloc(1, sizeof(USER_DATA));
     if (!data)
 	return;
     if (!known_grp) {
@@ -620,7 +620,7 @@
 
 PRIVATE void save_uid_info ARGS2(char *, name, int, user)
 {
-    USER_DATA *data = calloc(1, sizeof(USER_DATA));
+    USER_DATA *data = (USER_DATA *)calloc(1, sizeof(USER_DATA));
     if (!data)
 	return;
     if (!known_pwd) {
Index: WWW/Library/Implementation/HTAAUtil.h
--- 2.8.2dev.25/WWW/Library/Implementation/HTAAUtil.h	Wed Mar 17 20:17:11 1999
+++ 2.8.2dev.26/WWW/Library/Implementation/HTAAUtil.h	Wed May  5 18:33:59 1999
@@ -33,22 +33,6 @@
 #include <HTList.h>
 
 /*
-
-Default filenames
-
- */
-#ifndef PASSWD_FILE
-#define PASSWD_FILE     "/home2/luotonen/passwd"
-#endif
-
-#ifndef GROUP_FILE
-#define GROUP_FILE      "/home2/luotonen/group"
-#endif
-
-#define ACL_FILE_NAME   ".www_acl"
-
-
-/*
 ** Numeric constants
 */
 #define MAX_USERNAME_LEN        16      /* @@ Longest allowed username    */
Index: WWW/Library/Implementation/HTAccess.c
--- 2.8.2dev.25/WWW/Library/Implementation/HTAccess.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/WWW/Library/Implementation/HTAccess.c	Wed May  5 18:33:59 1999
@@ -865,12 +865,6 @@
 	    redirection_attempts = 0;
 	    return YES;
 	} else {
-#if NOT_USED_CODE
-	    /* disabled 1997-10-28 - kw
-	       callers already do this when requested
-	    */
-	    reloading = TRUE;
-#endif
 	    ForcingNoCache = YES;
 	    CTRACE(tfp, "HTAccess: Auto-reloading document.\n");
 	}
Index: WWW/Library/Implementation/HTMIME.c
Prereq:  0.2 
--- 2.8.2dev.25/WWW/Library/Implementation/HTMIME.c	Tue Mar 30 10:10:37 1999
+++ 2.8.2dev.26/WWW/Library/Implementation/HTMIME.c	Wed May  5 18:33:59 1999
@@ -2121,61 +2121,6 @@
 #endif /* NOTDEFINED */
 
 /*
-**  Modified for Lynx-jp by Takuya ASADA (and K&Rized by FM).
-*/
-#if NOTDEFINED
-PUBLIC int main ARGS2(
-	int,		ac,
-	char **,	av)
-{
-    FILE *fp;
-    char buf[BUFLEN];
-    char header = 1, body = 0, r_jis = 0;
-    int  i, c;
-
-    for (i = 1; i < ac; i++) {
-	if (strcmp(av[i], "-B") == NULL)
-	    body = 1;
-	else if (strcmp(av[i], "-r") == NULL)
-	    r_jis = 1;
-	else
-	    break;
-    }
-
-    if (i >= ac) {
-	fp = stdin;
-    } else {
-	if ((fp = fopen(av[i], "r")) == NULL) {
-	    fprintf(stderr, "%s: cannot open %s\n", av[0], av[i]);
-	    exit(1);
-	}
-    }
-
-    while (fgets(buf, BUFLEN, fp)) {
-	if (buf[0] == '\n' && buf[1] == '\0')
-	    header = 0;
-	if (header) {
-	    c = fgetc(fp);
-	    if (c == ' ' || c == '\t') {
-		buf[strlen(buf)-1] = '\0';
-		ungetc(c, fp);
-	    } else {
-		ungetc(c, fp);
-	    }
-	}
-	if (header || body)
-	    HTmmdecode(buf, buf);
-	if (r_jis)
-	    HTrjis(buf, buf);
-	fprintf(stdout, "%s", buf);
-    }
-
-    close(fp);
-    exit(0);
-}
-#endif /* NOTDEFINED */
-
-/*
 **  Insert ESC where it seems lost.
 **  (The author of this function "rjis" is S. Ichikawa.)
 */
Index: WWW/Library/Implementation/HTUtils.h
--- 2.8.2dev.25/WWW/Library/Implementation/HTUtils.h	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/WWW/Library/Implementation/HTUtils.h	Wed May  5 18:33:59 1999
@@ -305,10 +305,14 @@
 
 #define WHITE(c) (((unsigned char)(TOASCII(c))) <= 32)
 
+/*     Inline Function LYIsASCII: Is character c a traditional ASCII
+**     character (i.e. <128) after converting from host character set.  */
+
+#define LYIsASCII(c) (TOASCII((unsigned char)(c)) < 128)
 
 /*
 
-Sucess (>=0) and failure (<0) codes
+Success (>=0) and failure (<0) codes
 
 Some of the values are chosen to be HTTP-like, but status return values
 are generally not the response status from any specific protocol.
Index: WWW/Library/Implementation/SGML.c
--- 2.8.2dev.25/WWW/Library/Implementation/SGML.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/WWW/Library/Implementation/SGML.c	Wed May  5 18:33:59 1999
@@ -60,6 +60,8 @@
 #define START TRUE
 #define STOP FALSE
 
+#define PUTS_TR(x) psrc_convert_string = TRUE; PUTS(x)
+
 #else
 #  define PSRC(x)
 #  define NPSRC(x)
@@ -1973,6 +1975,13 @@
 	    **	via handle_entity(), or if the terminator is
 	    **	not the "standard" semi-colon for HTML. - FM
 	    */
+#ifdef USE_PSRC
+	    if (psrc_view && FoundEntity && c == ';') {
+		HTMLSRC_apply_markup(context,HTL_entity, START);
+		PUTC(c);
+		HTMLSRC_apply_markup(context,HTL_entity, STOP);
+	    }
+#endif
 	    if (!FoundEntity || c != ';')
 		goto top1;
 	}
@@ -3249,7 +3258,7 @@
 		    PSRCSTART(href);
 		    HTStartAnchor(context->target,NULL,string->data);
 		}
-		PUTS(string->data);
+		PUTS_TR(string->data);
 		if (cur_attr_is_href) {
 		    (*context->actions->end_element)(
 			context->target,
@@ -3320,7 +3329,7 @@
 		    PSRCSTART(href);
 		    HTStartAnchor(context->target,NULL,string->data);
 		}
-		PUTS(string->data);
+		PUTS_TR(string->data);
 		if (cur_attr_is_href) {
 		    (*context->actions->end_element)(
 			context->target,
@@ -3384,7 +3393,7 @@
 		    PSRCSTART(href);
 		    HTStartAnchor(context->target,NULL,string->data);
 		}
-		PUTS(string->data);
+		PUTS_TR(string->data);
 		if (cur_attr_is_href) {
 		    (*context->actions->end_element)(
 			context->target,
@@ -3996,6 +4005,7 @@
 	SGML_string(context, "<HTML><HEAD><TITLE>source</TITLE></HEAD>"
 			     "<BODY><PRE>") ;
 	psrc_view = TRUE;
+	psrc_convert_string = FALSE;
 	sgml_in_psrc_was_initialized = TRUE;
 	seen_letter_in_junk_tag = FALSE;
     }
Index: WWW/Library/vms/descrip.mms
--- 2.8.2dev.25/WWW/Library/vms/descrip.mms	Tue Apr 13 03:39:16 1999
+++ 2.8.2dev.26/WWW/Library/vms/descrip.mms	Wed May  5 18:33:59 1999
@@ -107,7 +107,7 @@
 .ifdef MULTINET
 TCP = MULTINET
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), MULTINET) $(INCLUDES)
 .endif
@@ -116,7 +116,7 @@
 .ifdef WIN_TCP
 TCP = WIN_TCP
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), WIN_TCP)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), WIN_TCP)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), WIN_TCP) $(INCLUDES)
 .endif
@@ -125,7 +125,7 @@
 .ifdef CMU_TCP
 TCP = CMU_TCP
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), CMU_TCP)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), CMU_TCP)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), CMU_TCP) $(INCLUDES)
 .endif
@@ -134,7 +134,7 @@
 .ifdef SOCKETSHR_TCP
 TCP = SOCKETSHR_TCP
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), SOCKETSHR_TCP)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), SOCKETSHR_TCP)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), SOCKETSHR_TCP) $(INCLUDES)
 .endif
@@ -153,7 +153,7 @@
 .else
 TCP = MULTINET			! (Default to MULTINET)
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=ANSI $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
+CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
 .else
 CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), MULTINET) $(INCLUDES)
 .endif
Index: config.hin
--- 2.8.2dev.25/config.hin	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/config.hin	Wed May  5 18:33:59 1999
@@ -94,6 +94,7 @@
 #undef HAVE_TTYTYPE
 #undef HAVE_TYPE_UNIONWAIT	/* CF_UNION_WAIT */
 #undef HAVE_UNISTD_H		/* have <unistd.h> */
+#undef HAVE_UNSETENV
 #undef HAVE_USE_DEFAULT_COLORS	/* ncurses extension */
 #undef HAVE_UTMP
 #undef HAVE_VALUES_H		/* defined by AM_GNU_GETTEXT */
Index: configure
--- 2.8.2dev.25/configure	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/configure	Wed May  5 18:33:59 1999
@@ -224,8 +224,8 @@
   --enable-externs        use external commands
   --enable-font-switch    use Linux setfont for character-translation
   --enable-cgi-links      support cgi links w/o a http daemon
-  --enable-exec-links     support cgi links w/o a http daemon
-  --enable-exec-scripts   support cgi links w/o a http daemon
+  --enable-exec-links     allow lynx to execute programs accessed via a link
+  --enable-exec-scripts   allow lynx to execute programs inferred from a link
 EOF
 cat <<EOF
   --enable-internal-links handle following links to same doc differently
@@ -3376,6 +3376,7 @@
 eval NLS_DATADIR="$withval"
 
 
+INTLDIR_CPPFLAGS=
 INTLDIR_MAKE=
 MSG_DIR_MAKE=
 SUB_MAKEFILE=
@@ -3383,7 +3384,7 @@
 use_our_messages=no
 if test -d $srcdir/po ; then
 echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6
-echo "configure:3387: checking if we should use included message-library" >&5
+echo "configure:3388: checking if we should use included message-library" >&5
 	
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
 if test "${enable_included_msgs+set}" = set; then
@@ -3419,17 +3420,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3423: checking for $ac_hdr" >&5
+echo "configure:3424: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3428 "configure"
+#line 3429 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3469,6 +3470,12 @@
 	fi
 fi
 
+if test -z "$INTLDIR_MAKE" ; then
+	INTLDIR_CPPFLAGS='-I$(top_srcdir)/intl'
+fi
+
+
+
 
 
 
@@ -3493,7 +3500,7 @@
 fi
 
 echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6
-echo "configure:3497: checking if you want full utility pathnames" >&5
+echo "configure:3504: checking if you want full utility pathnames" >&5
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
 if test "${enable_full_paths+set}" = set; then
@@ -3518,7 +3525,7 @@
 
 
 echo $ac_n "checking for system mailer""... $ac_c" 1>&6
-echo "configure:3522: checking for system mailer" >&5
+echo "configure:3529: checking for system mailer" >&5
 if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3545,7 +3552,7 @@
 
 
 echo $ac_n "checking system mail flags""... $ac_c" 1>&6
-echo "configure:3549: checking system mail flags" >&5
+echo "configure:3556: checking system mail flags" >&5
 if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3573,7 +3580,7 @@
 	# Extract the first word of "chmod", so it can be a program name with args.
 set dummy chmod; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3577: checking for $ac_word" >&5
+echo "configure:3584: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3608,7 +3615,7 @@
 
 else
 	echo $ac_n "checking for chmod""... $ac_c" 1>&6
-echo "configure:3612: checking for chmod" >&5
+echo "configure:3619: checking for chmod" >&5
 	echo "$ac_t""$CHMOD" 1>&6
 	eval 'ac_cv_path_'CHMOD'="'chmod'"'
 fi
@@ -3650,7 +3657,7 @@
 	# Extract the first word of "compress", so it can be a program name with args.
 set dummy compress; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3654: checking for $ac_word" >&5
+echo "configure:3661: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3685,7 +3692,7 @@
 
 else
 	echo $ac_n "checking for compress""... $ac_c" 1>&6
-echo "configure:3689: checking for compress" >&5
+echo "configure:3696: checking for compress" >&5
 	echo "$ac_t""$COMPRESS" 1>&6
 	eval 'ac_cv_path_'COMPRESS'="'compress'"'
 fi
@@ -3727,7 +3734,7 @@
 	# Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3731: checking for $ac_word" >&5
+echo "configure:3738: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3762,7 +3769,7 @@
 
 else
 	echo $ac_n "checking for cp""... $ac_c" 1>&6
-echo "configure:3766: checking for cp" >&5
+echo "configure:3773: checking for cp" >&5
 	echo "$ac_t""$COPY" 1>&6
 	eval 'ac_cv_path_'COPY'="'cp'"'
 fi
@@ -3804,7 +3811,7 @@
 	# Extract the first word of "gzip", so it can be a program name with args.
 set dummy gzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3808: checking for $ac_word" >&5
+echo "configure:3815: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3839,7 +3846,7 @@
 
 else
 	echo $ac_n "checking for gzip""... $ac_c" 1>&6
-echo "configure:3843: checking for gzip" >&5
+echo "configure:3850: checking for gzip" >&5
 	echo "$ac_t""$GZIP" 1>&6
 	eval 'ac_cv_path_'GZIP'="'gzip'"'
 fi
@@ -3881,7 +3888,7 @@
 	# Extract the first word of "mkdir", so it can be a program name with args.
 set dummy mkdir; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3885: checking for $ac_word" >&5
+echo "configure:3892: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3916,7 +3923,7 @@
 
 else
 	echo $ac_n "checking for mkdir""... $ac_c" 1>&6
-echo "configure:3920: checking for mkdir" >&5
+echo "configure:3927: checking for mkdir" >&5
 	echo "$ac_t""$MKDIR" 1>&6
 	eval 'ac_cv_path_'MKDIR'="'mkdir'"'
 fi
@@ -3958,7 +3965,7 @@
 	# Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3962: checking for $ac_word" >&5
+echo "configure:3969: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3993,7 +4000,7 @@
 
 else
 	echo $ac_n "checking for mv""... $ac_c" 1>&6
-echo "configure:3997: checking for mv" >&5
+echo "configure:4004: checking for mv" >&5
 	echo "$ac_t""$MV" 1>&6
 	eval 'ac_cv_path_'MV'="'mv'"'
 fi
@@ -4035,7 +4042,7 @@
 	# Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4039: checking for $ac_word" >&5
+echo "configure:4046: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4070,7 +4077,7 @@
 
 else
 	echo $ac_n "checking for rm""... $ac_c" 1>&6
-echo "configure:4074: checking for rm" >&5
+echo "configure:4081: checking for rm" >&5
 	echo "$ac_t""$RM" 1>&6
 	eval 'ac_cv_path_'RM'="'rm'"'
 fi
@@ -4112,7 +4119,7 @@
 	# Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4116: checking for $ac_word" >&5
+echo "configure:4123: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4147,7 +4154,7 @@
 
 else
 	echo $ac_n "checking for tar""... $ac_c" 1>&6
-echo "configure:4151: checking for tar" >&5
+echo "configure:4158: checking for tar" >&5
 	echo "$ac_t""$TAR" 1>&6
 	eval 'ac_cv_path_'TAR'="'tar'"'
 fi
@@ -4189,7 +4196,7 @@
 	# Extract the first word of "touch", so it can be a program name with args.
 set dummy touch; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4193: checking for $ac_word" >&5
+echo "configure:4200: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4224,7 +4231,7 @@
 
 else
 	echo $ac_n "checking for touch""... $ac_c" 1>&6
-echo "configure:4228: checking for touch" >&5
+echo "configure:4235: checking for touch" >&5
 	echo "$ac_t""$TOUCH" 1>&6
 	eval 'ac_cv_path_'TOUCH'="'touch'"'
 fi
@@ -4266,7 +4273,7 @@
 	# Extract the first word of "gunzip", so it can be a program name with args.
 set dummy gunzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4270: checking for $ac_word" >&5
+echo "configure:4277: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4301,7 +4308,7 @@
 
 else
 	echo $ac_n "checking for gunzip""... $ac_c" 1>&6
-echo "configure:4305: checking for gunzip" >&5
+echo "configure:4312: checking for gunzip" >&5
 	echo "$ac_t""$UNCOMPRESS" 1>&6
 	eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"'
 fi
@@ -4343,7 +4350,7 @@
 	# Extract the first word of "unzip", so it can be a program name with args.
 set dummy unzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4347: checking for $ac_word" >&5
+echo "configure:4354: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4378,7 +4385,7 @@
 
 else
 	echo $ac_n "checking for unzip""... $ac_c" 1>&6
-echo "configure:4382: checking for unzip" >&5
+echo "configure:4389: checking for unzip" >&5
 	echo "$ac_t""$UNZIP" 1>&6
 	eval 'ac_cv_path_'UNZIP'="'unzip'"'
 fi
@@ -4420,7 +4427,7 @@
 	# Extract the first word of "bzip2", so it can be a program name with args.
 set dummy bzip2; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4424: checking for $ac_word" >&5
+echo "configure:4431: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4455,7 +4462,7 @@
 
 else
 	echo $ac_n "checking for bzip2""... $ac_c" 1>&6
-echo "configure:4459: checking for bzip2" >&5
+echo "configure:4466: checking for bzip2" >&5
 	echo "$ac_t""$BZIP2" 1>&6
 	eval 'ac_cv_path_'BZIP2'="'bzip2'"'
 fi
@@ -4497,7 +4504,7 @@
 	# Extract the first word of "uudecode", so it can be a program name with args.
 set dummy uudecode; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4501: checking for $ac_word" >&5
+echo "configure:4508: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4532,7 +4539,7 @@
 
 else
 	echo $ac_n "checking for uudecode""... $ac_c" 1>&6
-echo "configure:4536: checking for uudecode" >&5
+echo "configure:4543: checking for uudecode" >&5
 	echo "$ac_t""$UUDECODE" 1>&6
 	eval 'ac_cv_path_'UUDECODE'="'uudecode'"'
 fi
@@ -4574,7 +4581,7 @@
 	# Extract the first word of "zcat", so it can be a program name with args.
 set dummy zcat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4578: checking for $ac_word" >&5
+echo "configure:4585: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4609,7 +4616,7 @@
 
 else
 	echo $ac_n "checking for zcat""... $ac_c" 1>&6
-echo "configure:4613: checking for zcat" >&5
+echo "configure:4620: checking for zcat" >&5
 	echo "$ac_t""$ZCAT" 1>&6
 	eval 'ac_cv_path_'ZCAT'="'zcat'"'
 fi
@@ -4651,7 +4658,7 @@
 	# Extract the first word of "zip", so it can be a program name with args.
 set dummy zip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4655: checking for $ac_word" >&5
+echo "configure:4662: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4686,7 +4693,7 @@
 
 else
 	echo $ac_n "checking for zip""... $ac_c" 1>&6
-echo "configure:4690: checking for zip" >&5
+echo "configure:4697: checking for zip" >&5
 	echo "$ac_t""$ZIP" 1>&6
 	eval 'ac_cv_path_'ZIP'="'zip'"'
 fi
@@ -4728,7 +4735,7 @@
 	# Extract the first word of "telnet", so it can be a program name with args.
 set dummy telnet; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4732: checking for $ac_word" >&5
+echo "configure:4739: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4763,7 +4770,7 @@
 
 else
 	echo $ac_n "checking for telnet""... $ac_c" 1>&6
-echo "configure:4767: checking for telnet" >&5
+echo "configure:4774: checking for telnet" >&5
 	echo "$ac_t""$TELNET" 1>&6
 	eval 'ac_cv_path_'TELNET'="'telnet'"'
 fi
@@ -4805,7 +4812,7 @@
 	# Extract the first word of "tn3270", so it can be a program name with args.
 set dummy tn3270; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4809: checking for $ac_word" >&5
+echo "configure:4816: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4840,7 +4847,7 @@
 
 else
 	echo $ac_n "checking for tn3270""... $ac_c" 1>&6
-echo "configure:4844: checking for tn3270" >&5
+echo "configure:4851: checking for tn3270" >&5
 	echo "$ac_t""$TN3270" 1>&6
 	eval 'ac_cv_path_'TN3270'="'tn3270'"'
 fi
@@ -4882,7 +4889,7 @@
 	# Extract the first word of "rlogin", so it can be a program name with args.
 set dummy rlogin; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4886: checking for $ac_word" >&5
+echo "configure:4893: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4917,7 +4924,7 @@
 
 else
 	echo $ac_n "checking for rlogin""... $ac_c" 1>&6
-echo "configure:4921: checking for rlogin" >&5
+echo "configure:4928: checking for rlogin" >&5
 	echo "$ac_t""$RLOGIN" 1>&6
 	eval 'ac_cv_path_'RLOGIN'="'rlogin'"'
 fi
@@ -4978,7 +4985,7 @@
 if test -z "$GCC" ; then
 	
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:4982: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:4989: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5002,7 +5009,7 @@
 do
 	CFLAGS="$cf_save_CFLAGS $cf_arg"
 	cat > conftest.$ac_ext <<EOF
-#line 5006 "configure"
+#line 5013 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -5018,7 +5025,7 @@
 	struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:5022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -5046,12 +5053,12 @@
 
 fi
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5050: checking for working const" >&5
+echo "configure:5057: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5055 "configure"
+#line 5062 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5100,7 +5107,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -5142,7 +5149,7 @@
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 	echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6
-echo "configure:5146: checking for strcmp in -lc_s" >&5
+echo "configure:5153: checking for strcmp in -lc_s" >&5
 ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5150,7 +5157,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5154 "configure"
+#line 5161 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5161,7 +5168,7 @@
 strcmp()
 ; return 0; }
 EOF
-if { (eval echo configure:5165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5251,7 +5258,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5255: checking for $ac_word" >&5
+echo "configure:5262: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5296,17 +5303,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5300: checking for $ac_hdr" >&5
+echo "configure:5307: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5305 "configure"
+#line 5312 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5350,17 +5357,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5354: checking for $ac_hdr" >&5
+echo "configure:5361: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5359 "configure"
+#line 5366 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5398,16 +5405,16 @@
 	cf_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $TRY_CFLAGS"
 	echo $ac_n "checking if we should use compile options $TRY_CFLAGS""... $ac_c" 1>&6
-echo "configure:5402: checking if we should use compile options $TRY_CFLAGS" >&5
+echo "configure:5409: checking if we should use compile options $TRY_CFLAGS" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 5404 "configure"
+#line 5411 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 FILE *fp = stdin
 ; return 0; }
 EOF
-if { (eval echo configure:5411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -5425,7 +5432,7 @@
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
 echo $ac_n "checking if you want socks library""... $ac_c" 1>&6
-echo "configure:5429: checking if you want socks library" >&5
+echo "configure:5436: checking if you want socks library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5445,7 +5452,7 @@
 echo "$ac_t""$cf_cv_use_libsocks" 1>&6
 
 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6
-echo "configure:5449: checking if you want socks5 library" >&5
+echo "configure:5456: checking if you want socks5 library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5511,7 +5518,7 @@
 EOF
 
 cat > conftest.$ac_ext <<EOF
-#line 5515 "configure"
+#line 5522 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5520,7 +5527,7 @@
 	accept((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -5550,9 +5557,9 @@
 EOF
 
 echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6
-echo "configure:5554: checking if the socks library uses socks4 prefix" >&5
+echo "configure:5561: checking if the socks library uses socks4 prefix" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5556 "configure"
+#line 5563 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -5561,7 +5568,7 @@
 	Rinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -5573,14 +5580,14 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 5577 "configure"
+#line 5584 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int main() {
 SOCKSinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_use_socks4=no
 else
@@ -5649,7 +5656,7 @@
 	
 cf_test_netlibs=no
 echo $ac_n "checking for network libraries""... $ac_c" 1>&6
-echo "configure:5653: checking for network libraries" >&5
+echo "configure:5660: checking for network libraries" >&5
 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5660,12 +5667,12 @@
 for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5664: checking for $ac_func" >&5
+echo "configure:5671: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5669 "configure"
+#line 5676 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5688,7 +5695,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5711,7 +5718,7 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:5715: checking for gethostname in -lnsl" >&5
+echo "configure:5722: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5719,7 +5726,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5723 "configure"
+#line 5730 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5730,7 +5737,7 @@
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5763,7 +5770,7 @@
 	
 		
 echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6
-echo "configure:5767: checking for gethostname in -lsocket" >&5
+echo "configure:5774: checking for gethostname in -lsocket" >&5
 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5771,7 +5778,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5775 "configure"
+#line 5782 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5782,7 +5789,7 @@
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:5786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5826,21 +5833,21 @@
 # FIXME:  sequent needs this library (i.e., -lsocket -linet -lnsl), but
 # I don't know the entrypoints - 97/7/22 TD
 echo $ac_n "checking for -linet""... $ac_c" 1>&6
-echo "configure:5830: checking for -linet" >&5
+echo "configure:5837: checking for -linet" >&5
 if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5837 "configure"
+#line 5844 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_inet=yes
 else
@@ -5863,12 +5870,12 @@
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5867: checking for $ac_func" >&5
+echo "configure:5874: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5872 "configure"
+#line 5879 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5891,7 +5898,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5914,7 +5921,7 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:5918: checking for socket in -lsocket" >&5
+echo "configure:5925: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5922,7 +5929,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5926 "configure"
+#line 5933 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5933,7 +5940,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:5937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5966,7 +5973,7 @@
 	
 		
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:5970: checking for socket in -lbsd" >&5
+echo "configure:5977: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5974,7 +5981,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5978 "configure"
+#line 5985 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5985,7 +5992,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6030,12 +6037,12 @@
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6034: checking for $ac_func" >&5
+echo "configure:6041: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6039 "configure"
+#line 6046 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6058,7 +6065,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6081,7 +6088,7 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6085: checking for gethostbyname in -lnsl" >&5
+echo "configure:6092: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6089,7 +6096,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6093 "configure"
+#line 6100 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6100,7 +6107,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6141,12 +6148,12 @@
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6145: checking for $ac_func" >&5
+echo "configure:6152: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6150 "configure"
+#line 6157 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6169,7 +6176,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6192,7 +6199,7 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
-echo "configure:6196: checking for strcasecmp in -lresolv" >&5
+echo "configure:6203: checking for strcasecmp in -lresolv" >&5
 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6200,7 +6207,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6204 "configure"
+#line 6211 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6211,7 +6218,7 @@
 strcasecmp()
 ; return 0; }
 EOF
-if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6257,13 +6264,13 @@
 fi
 
 echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6
-echo "configure:6261: checking for inet_aton function" >&5
+echo "configure:6268: checking for inet_aton function" >&5
 if eval "test \"`echo '$''{'cf_cv_have_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 6267 "configure"
+#line 6274 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6274,7 +6281,7 @@
 inet_aton(0, (struct in_addr *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:6278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_inet_aton=yes
 else
@@ -6294,13 +6301,13 @@
 
 else
     echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6
-echo "configure:6298: checking for inet_addr function" >&5
+echo "configure:6305: checking for inet_addr function" >&5
 if eval "test \"`echo '$''{'cf_cv_have_inet_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 6304 "configure"
+#line 6311 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6311,7 +6318,7 @@
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:6315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_inet_addr=yes
 else
@@ -6326,7 +6333,7 @@
 echo "$ac_t""$cf_cv_have_inet_addr" 1>&6
     if test "$cf_cv_have_inet_addr" = no ; then
 	echo $ac_n "checking for library with inet_addr""... $ac_c" 1>&6
-echo "configure:6330: checking for library with inet_addr" >&5
+echo "configure:6337: checking for library with inet_addr" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_inet_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6336,7 +6343,7 @@
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat > conftest.$ac_ext <<EOF
-#line 6340 "configure"
+#line 6347 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6347,7 +6354,7 @@
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:6351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -6374,7 +6381,7 @@
 
 
 echo $ac_n "checking for screen type""... $ac_c" 1>&6
-echo "configure:6378: checking for screen type" >&5
+echo "configure:6385: checking for screen type" >&5
 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6409,12 +6416,12 @@
 curses)
 	
 echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:6413: checking for initscr" >&5
+echo "configure:6420: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6418 "configure"
+#line 6425 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -6437,7 +6444,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -6458,7 +6465,7 @@
 case $host_os in #(vi
 freebsd*) #(vi
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:6462: checking for tgoto in -lmytinfo" >&5
+echo "configure:6469: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6466,7 +6473,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6470 "configure"
+#line 6477 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6477,7 +6484,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6500,7 +6507,7 @@
 	;;
 hpux10.*)
 	echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-echo "configure:6504: checking for initscr in -lcur_colr" >&5
+echo "configure:6511: checking for initscr in -lcur_colr" >&5
 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6508,7 +6515,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcur_colr  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6512 "configure"
+#line 6519 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6519,7 +6526,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6543,7 +6550,7 @@
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-echo "configure:6547: checking for initscr in -lHcurses" >&5
+echo "configure:6554: checking for initscr in -lHcurses" >&5
 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6551,7 +6558,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lHcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6555 "configure"
+#line 6562 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6562,7 +6569,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6611,12 +6618,12 @@
 	# Check for library containing tgoto.  Do this before curses library
 	# because it may be needed to link the test-case for initscr.
 	echo $ac_n "checking for tgoto""... $ac_c" 1>&6
-echo "configure:6615: checking for tgoto" >&5
+echo "configure:6622: checking for tgoto" >&5
 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6620 "configure"
+#line 6627 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto(); below.  */
@@ -6639,7 +6646,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_tgoto=yes"
 else
@@ -6660,7 +6667,7 @@
 		for cf_term_lib in termcap termlib unknown
 		do
 			echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-echo "configure:6664: checking for tgoto in -l$cf_term_lib" >&5
+echo "configure:6671: checking for tgoto in -l$cf_term_lib" >&5
 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6668,7 +6675,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_term_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6672 "configure"
+#line 6679 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6679,7 +6686,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6709,7 +6716,7 @@
 	for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown
 	do
 		echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-echo "configure:6713: checking for initscr in -l$cf_curs_lib" >&5
+echo "configure:6720: checking for initscr in -l$cf_curs_lib" >&5
 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6717,7 +6724,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_curs_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6721 "configure"
+#line 6728 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6728,7 +6735,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6754,16 +6761,16 @@
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
 		echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
-echo "configure:6758: checking if we can link with $cf_curs_lib library" >&5
+echo "configure:6765: checking if we can link with $cf_curs_lib library" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6760 "configure"
+#line 6767 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6777,16 +6784,16 @@
 		test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; }
 	elif test "$cf_term_lib" != predefined ; then
 		echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
-echo "configure:6781: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+echo "configure:6788: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6783 "configure"
+#line 6790 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=no
 else
@@ -6796,14 +6803,14 @@
   
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 6800 "configure"
+#line 6807 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6825,14 +6832,14 @@
 
 	
 echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6
-echo "configure:6829: checking for curses performance tradeoff" >&5
+echo "configure:6836: checking for curses performance tradeoff" >&5
 if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cf_cv_curs_performance=no
     cat > conftest.$ac_ext <<EOF
-#line 6836 "configure"
+#line 6843 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6846,11 +6853,11 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 6854 "configure"
+#line 6861 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -6865,7 +6872,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_curs_performance=yes
 else
@@ -6890,13 +6897,13 @@
 ncurses)
 	
 echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6
-echo "configure:6894: checking for ncurses header file" >&5
+echo "configure:6901: checking for ncurses header file" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 6900 "configure"
+#line 6907 "configure"
 #include "confdefs.h"
 #include <curses.h>
 int main() {
@@ -6913,7 +6920,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_header=predefined
 else
@@ -6999,7 +7006,7 @@
 	;;
 esac
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:7003: checking for ncurses version" >&5
+echo "configure:7010: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7024,7 +7031,7 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:7028: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:7035: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -7033,7 +7040,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 7037 "configure"
+#line 7044 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7056,7 +7063,7 @@
 	exit(0);
 }
 EOF
-if { (eval echo configure:7060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7081,7 +7088,7 @@
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:7085: checking for Gpm_Open in -lgpm" >&5
+echo "configure:7092: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7089,7 +7096,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7093 "configure"
+#line 7100 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7100,7 +7107,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:7104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7116,7 +7123,7 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-echo "configure:7120: checking for initscr in -lgpm" >&5
+echo "configure:7127: checking for initscr in -lgpm" >&5
 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7124,7 +7131,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7128 "configure"
+#line 7135 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7135,7 +7142,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7166,7 +7173,7 @@
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:7170: checking for tgoto in -lmytinfo" >&5
+echo "configure:7177: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7174,7 +7181,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7178 "configure"
+#line 7185 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7185,7 +7192,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7213,12 +7220,12 @@
 	cf_cv_have_lib_ncurses=no
 	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:7217: checking for initscr" >&5
+echo "configure:7224: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7222 "configure"
+#line 7229 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -7241,7 +7248,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -7261,17 +7268,17 @@
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:7265: checking for initscr in -lncurses" >&5
+echo "configure:7272: checking for initscr in -lncurses" >&5
 		LIBS="-lncurses $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 7268 "configure"
+#line 7275 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_ncurses=yes
@@ -7298,17 +7305,17 @@
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6
-echo "configure:7302: checking for -lncurses in $cf_libdir" >&5
+echo "configure:7309: checking for -lncurses in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lncurses $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 7305 "configure"
+#line 7312 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_ncurses=yes
@@ -7340,7 +7347,7 @@
 
 if test -n "$cf_ncurses_LIBS" ; then
 	echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:7344: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
+echo "configure:7351: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
 		q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'`
@@ -7349,14 +7356,14 @@
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 7353 "configure"
+#line 7360 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7373,20 +7380,20 @@
 slang)
 	
 echo $ac_n "checking for slang header file""... $ac_c" 1>&6
-echo "configure:7377: checking for slang header file" >&5
+echo "configure:7384: checking for slang header file" >&5
 if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 7383 "configure"
+#line 7390 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 printf("%s\n", SLANG_VERSION)
 ; return 0; }
 EOF
-if { (eval echo configure:7390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_slang_header=predefined
 else
@@ -7468,24 +7475,24 @@
   
 cf_cv_termlib=none
 cat > conftest.$ac_ext <<EOF
-#line 7472 "configure"
+#line 7479 "configure"
 #include "confdefs.h"
 
 int main() {
 char *x=(char*)tgoto("",0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:7479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 7482 "configure"
+#line 7489 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=tigetstr("")
 ; return 0; }
 EOF
-if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_termlib=terminfo
 else
@@ -7507,7 +7514,7 @@
 # HP-UX 9.x terminfo has setupterm, but no tigetstr.
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tigetstr in -ltermlib""... $ac_c" 1>&6
-echo "configure:7511: checking for tigetstr in -ltermlib" >&5
+echo "configure:7518: checking for tigetstr in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tigetstr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7515,7 +7522,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7519 "configure"
+#line 7526 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7526,7 +7533,7 @@
 tigetstr()
 ; return 0; }
 EOF
-if { (eval echo configure:7530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7549,7 +7556,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6
-echo "configure:7553: checking for tgoto in -ltermlib" >&5
+echo "configure:7560: checking for tgoto in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7557,7 +7564,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7561 "configure"
+#line 7568 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7568,7 +7575,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7592,7 +7599,7 @@
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:7596: checking for initscr in -lcurses" >&5
+echo "configure:7603: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7600,7 +7607,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7604 "configure"
+#line 7611 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7611,7 +7618,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7632,7 +7639,7 @@
 fi
 
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:7636: checking for tgoto in -ltermcap" >&5
+echo "configure:7643: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7640,7 +7647,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7644 "configure"
+#line 7651 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7651,7 +7658,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7674,7 +7681,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:7678: checking for tgoto in -ltermcap" >&5
+echo "configure:7685: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7682,7 +7689,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7686 "configure"
+#line 7693 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7693,7 +7700,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7716,7 +7723,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	echo $ac_n "checking for tgoto in -lncurses""... $ac_c" 1>&6
-echo "configure:7720: checking for tgoto in -lncurses" >&5
+echo "configure:7727: checking for tgoto in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7724,7 +7731,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7728 "configure"
+#line 7735 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7735,7 +7742,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7767,12 +7774,12 @@
 
 cf_slang_LIBS2="$LIBS"
 echo $ac_n "checking for acos""... $ac_c" 1>&6
-echo "configure:7771: checking for acos" >&5
+echo "configure:7778: checking for acos" >&5
 if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7776 "configure"
+#line 7783 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos(); below.  */
@@ -7795,7 +7802,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_acos=yes"
 else
@@ -7814,7 +7821,7 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
-echo "configure:7818: checking for acos in -lm" >&5
+echo "configure:7825: checking for acos in -lm" >&5
 ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7822,7 +7829,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7826 "configure"
+#line 7833 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7833,7 +7840,7 @@
 acos()
 ; return 0; }
 EOF
-if { (eval echo configure:7837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7873,12 +7880,12 @@
 	cf_cv_have_lib_slang=no
 	cf_libdir=""
 	echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6
-echo "configure:7877: checking for SLtt_get_screen_size" >&5
+echo "configure:7884: checking for SLtt_get_screen_size" >&5
 if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7882 "configure"
+#line 7889 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size(); below.  */
@@ -7901,7 +7908,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_SLtt_get_screen_size=yes"
 else
@@ -7921,17 +7928,17 @@
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:7925: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:7932: checking for SLtt_get_screen_size in -lslang" >&5
 		LIBS="-lslang $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 7928 "configure"
+#line 7935 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:7935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_slang=yes
@@ -7958,17 +7965,17 @@
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6
-echo "configure:7962: checking for -lslang in $cf_libdir" >&5
+echo "configure:7969: checking for -lslang in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 7965 "configure"
+#line 7972 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:7972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_slang=yes
@@ -7999,7 +8006,7 @@
 
 cf_slang_LIBS3="$LIBS"
 echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6
-echo "configure:8003: checking if we can link slang without termcap" >&5
+echo "configure:8010: checking if we can link slang without termcap" >&5
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s@$cf_slang_LIBS1@@" -e 's@^.@@'`
 else
@@ -8007,14 +8014,14 @@
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'`
 cat > conftest.$ac_ext <<EOF
-#line 8011 "configure"
+#line 8018 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -8034,7 +8041,7 @@
 cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
 
 echo $ac_n "checking for location of config-file""... $ac_c" 1>&6
-echo "configure:8038: checking for location of config-file" >&5
+echo "configure:8045: checking for location of config-file" >&5
 LYNX_CFG_FILE=$cf_libdir/lynx.cfg
 cat >> confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
@@ -8044,12 +8051,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8048: checking for ANSI C header files" >&5
+echo "configure:8055: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8053 "configure"
+#line 8060 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8057,7 +8064,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8074,7 +8081,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 8078 "configure"
+#line 8085 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -8092,7 +8099,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 8096 "configure"
+#line 8103 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -8113,7 +8120,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 8117 "configure"
+#line 8124 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -8124,7 +8131,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:8128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -8148,12 +8155,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:8152: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:8159: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8157 "configure"
+#line 8164 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -8162,7 +8169,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:8166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -8187,12 +8194,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:8191: checking for $ac_hdr that defines DIR" >&5
+echo "configure:8198: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8196 "configure"
+#line 8203 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -8200,7 +8207,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:8204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -8225,7 +8232,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:8229: checking for opendir in -ldir" >&5
+echo "configure:8236: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8233,7 +8240,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8237 "configure"
+#line 8244 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8244,7 +8251,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8266,7 +8273,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8270: checking for opendir in -lx" >&5
+echo "configure:8277: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8274,7 +8281,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8278 "configure"
+#line 8285 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8285,7 +8292,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8324,17 +8331,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8328: checking for $ac_hdr" >&5
+echo "configure:8335: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8333 "configure"
+#line 8340 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8362,13 +8369,13 @@
 
 
 echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6
-echo "configure:8366: checking termio.h and termios.h" >&5
+echo "configure:8373: checking termio.h and termios.h" >&5
 if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 8372 "configure"
+#line 8379 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -8381,7 +8388,7 @@
 putchar (0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:8385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_termios=yes
 else
@@ -8404,17 +8411,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8408: checking for $ac_hdr" >&5
+echo "configure:8415: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8413 "configure"
+#line 8420 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8451,17 +8458,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8455: checking for $ac_hdr" >&5
+echo "configure:8462: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8460 "configure"
+#line 8467 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8491,17 +8498,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8495: checking for $ac_hdr" >&5
+echo "configure:8502: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8500 "configure"
+#line 8507 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8542,13 +8549,13 @@
 
 
 echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:8546: checking for union wait" >&5
+echo "configure:8553: checking for union wait" >&5
 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8552 "configure"
+#line 8559 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -8559,7 +8566,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:8563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -8570,7 +8577,7 @@
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 8574 "configure"
+#line 8581 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -8585,7 +8592,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -8612,20 +8619,20 @@
 if test $cf_cv_type_unionwait = yes; then
 
 	echo $ac_n "checking if union wait can be used as wait-arg""... $ac_c" 1>&6
-echo "configure:8616: checking if union wait can be used as wait-arg" >&5
+echo "configure:8623: checking if union wait can be used as wait-arg" >&5
 	if eval "test \"`echo '$''{'cf_cv_arg_union_wait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 8622 "configure"
+#line 8629 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; wait(&x)
 ; return 0; }
 EOF
-if { (eval echo configure:8629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_wait=yes
 else
@@ -8645,20 +8652,20 @@
 
 
 	echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6
-echo "configure:8649: checking if union wait can be used as waitpid-arg" >&5
+echo "configure:8656: checking if union wait can be used as waitpid-arg" >&5
 	if eval "test \"`echo '$''{'cf_cv_arg_union_waitpid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 8655 "configure"
+#line 8662 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; waitpid(0, &x, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:8662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_waitpid=yes
 else
@@ -8684,17 +8691,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8688: checking for $ac_hdr" >&5
+echo "configure:8695: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8693 "configure"
+#line 8700 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8721,13 +8728,13 @@
 done
 
 echo $ac_n "checking for standard varargs""... $ac_c" 1>&6
-echo "configure:8725: checking for standard varargs" >&5
+echo "configure:8732: checking for standard varargs" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_varargs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8731 "configure"
+#line 8738 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -8742,7 +8749,7 @@
 return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 ; return 0; }
 EOF
-if { (eval echo configure:8746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_varargs=yes
 else
@@ -8762,12 +8769,12 @@
 
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8766: checking for uid_t in sys/types.h" >&5
+echo "configure:8773: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8771 "configure"
+#line 8778 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -8796,7 +8803,7 @@
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:8800: checking type of array argument to getgroups" >&5
+echo "configure:8807: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8804,7 +8811,7 @@
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 8808 "configure"
+#line 8815 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -8829,7 +8836,7 @@
 }
 
 EOF
-if { (eval echo configure:8833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -8843,7 +8850,7 @@
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 8847 "configure"
+#line 8854 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -8867,12 +8874,12 @@
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:8871: checking for pid_t" >&5
+echo "configure:8878: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8876 "configure"
+#line 8883 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8900,12 +8907,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8904: checking for uid_t in sys/types.h" >&5
+echo "configure:8911: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8909 "configure"
+#line 8916 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -8934,12 +8941,12 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:8938: checking for mode_t" >&5
+echo "configure:8945: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8943 "configure"
+#line 8950 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8970,17 +8977,17 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:8974: checking for vfork.h" >&5
+echo "configure:8981: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8979 "configure"
+#line 8986 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9005,18 +9012,18 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:9009: checking for working vfork" >&5
+echo "configure:9016: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:9015: checking for vfork" >&5
+echo "configure:9022: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9020 "configure"
+#line 9027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -9039,7 +9046,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -9061,7 +9068,7 @@
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 9065 "configure"
+#line 9072 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -9156,7 +9163,7 @@
   }
 }
 EOF
-if { (eval echo configure:9160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -9180,13 +9187,13 @@
 
 
 echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6
-echo "configure:9184: checking if we should use fcntl or ioctl" >&5
+echo "configure:9191: checking if we should use fcntl or ioctl" >&5
 if eval "test \"`echo '$''{'cf_cv_fionbio'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9190 "configure"
+#line 9197 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9198,7 +9205,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=ioctl
 else
@@ -9207,7 +9214,7 @@
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 9211 "configure"
+#line 9218 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9224,7 +9231,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=fcntl
 else
@@ -9247,20 +9254,20 @@
 
 
 echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6
-echo "configure:9251: checking for broken/missing definition of remove" >&5
+echo "configure:9258: checking for broken/missing definition of remove" >&5
 if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9257 "configure"
+#line 9264 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:9264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=no
 else
@@ -9268,7 +9275,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 9272 "configure"
+#line 9279 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); } 
@@ -9276,7 +9283,7 @@
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:9280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=yes
 else
@@ -9300,13 +9307,13 @@
 
 
 echo $ac_n "checking for lstat""... $ac_c" 1>&6
-echo "configure:9304: checking for lstat" >&5
+echo "configure:9311: checking for lstat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_lstat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9310 "configure"
+#line 9317 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9315,7 +9322,7 @@
 lstat(".", (struct stat *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:9319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_lstat=yes
 else
@@ -9345,16 +9352,17 @@
 	putenv \
 	readdir \
 	strerror \
+	unsetenv \
 	waitpid \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9353: checking for $ac_func" >&5
+echo "configure:9361: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9358 "configure"
+#line 9366 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9377,7 +9385,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9407,12 +9415,12 @@
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9411: checking for $ac_func" >&5
+echo "configure:9419: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9416 "configure"
+#line 9424 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9435,7 +9443,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9466,12 +9474,12 @@
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:9470: checking for $ac_func declaration" >&5
+echo "configure:9478: checking for $ac_func declaration" >&5
 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9475 "configure"
+#line 9483 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -9480,11 +9488,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 9488 "configure"
+#line 9496 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -9493,7 +9501,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -9535,12 +9543,12 @@
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:9539: checking for $ac_func declaration" >&5
+echo "configure:9547: checking for $ac_func declaration" >&5
 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9544 "configure"
+#line 9552 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9551,11 +9559,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 9559 "configure"
+#line 9567 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9566,7 +9574,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -9608,13 +9616,13 @@
 
 
 echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6
-echo "configure:9612: checking if TRUE/FALSE are defined" >&5
+echo "configure:9620: checking if TRUE/FALSE are defined" >&5
 if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9618 "configure"
+#line 9626 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9623,7 +9631,7 @@
 int x = TRUE, y = FALSE
 ; return 0; }
 EOF
-if { (eval echo configure:9627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_bool_defs=yes
 else
@@ -9650,13 +9658,13 @@
 
 
 echo $ac_n "checking declaration of errno""... $ac_c" 1>&6
-echo "configure:9654: checking declaration of errno" >&5
+echo "configure:9662: checking declaration of errno" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 9660 "configure"
+#line 9668 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -9669,7 +9677,7 @@
 long x = (long) errno
 ; return 0; }
 EOF
-if { (eval echo configure:9673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_dcl_'errno'=yes'
 else
@@ -9699,9 +9707,9 @@
 EOF
 
     echo $ac_n "checking existence of errno""... $ac_c" 1>&6
-echo "configure:9703: checking existence of errno" >&5
+echo "configure:9711: checking existence of errno" >&5
         cat > conftest.$ac_ext <<EOF
-#line 9705 "configure"
+#line 9713 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -9711,7 +9719,7 @@
 errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:9715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval 'cf_cv_have_'errno'=yes'
 else
@@ -9741,20 +9749,20 @@
 
 
 echo $ac_n "checking for setlocale()""... $ac_c" 1>&6
-echo "configure:9745: checking for setlocale()" >&5
+echo "configure:9753: checking for setlocale()" >&5
 if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9751 "configure"
+#line 9759 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 setlocale(LC_ALL, "")
 ; return 0; }
 EOF
-if { (eval echo configure:9758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_locale=yes
 else
@@ -9775,13 +9783,13 @@
 
 
 echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6
-echo "configure:9779: checking if NGROUPS is defined" >&5
+echo "configure:9787: checking if NGROUPS is defined" >&5
 if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9785 "configure"
+#line 9793 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -9795,7 +9803,7 @@
 int x = NGROUPS
 ; return 0; }
 EOF
-if { (eval echo configure:9799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=yes
 else
@@ -9803,7 +9811,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 9807 "configure"
+#line 9815 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -9817,7 +9825,7 @@
 int x = NGROUPS_MAX
 ; return 0; }
 EOF
-if { (eval echo configure:9821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -9851,13 +9859,13 @@
 do
     
 echo $ac_n "checking declaration of $cf_name""... $ac_c" 1>&6
-echo "configure:9855: checking declaration of $cf_name" >&5
+echo "configure:9863: checking declaration of $cf_name" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 9861 "configure"
+#line 9869 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -9870,7 +9878,7 @@
 long x = (long) $cf_name
 ; return 0; }
 EOF
-if { (eval echo configure:9874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_dcl_'$cf_name'=yes'
 else
@@ -9900,9 +9908,9 @@
 EOF
 
     echo $ac_n "checking existence of $cf_name""... $ac_c" 1>&6
-echo "configure:9904: checking existence of $cf_name" >&5
+echo "configure:9912: checking existence of $cf_name" >&5
         cat > conftest.$ac_ext <<EOF
-#line 9906 "configure"
+#line 9914 "configure"
 #include "confdefs.h"
 
 #undef $cf_name
@@ -9912,7 +9920,7 @@
 $cf_name = 2
 ; return 0; }
 EOF
-if { (eval echo configure:9916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval 'cf_cv_have_'$cf_name'=yes'
 else
@@ -9943,13 +9951,13 @@
 
 
 echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6
-echo "configure:9947: checking if struct utmp is declared" >&5
+echo "configure:9955: checking if struct utmp is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 9953 "configure"
+#line 9961 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9958,7 +9966,7 @@
 struct utmp x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:9962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=yes
 else
@@ -9966,14 +9974,14 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 9970 "configure"
+#line 9978 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 int main() {
 struct utmpx x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:9977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=utmpx
 else
@@ -10002,13 +10010,13 @@
 
 
 echo $ac_n "checking if character set is EBCDIC""... $ac_c" 1>&6
-echo "configure:10006: checking if character set is EBCDIC" >&5
+echo "configure:10014: checking if character set is EBCDIC" >&5
 if eval "test \"`echo '$''{'cf_cv_ebcdic'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10012 "configure"
+#line 10020 "configure"
 #include "confdefs.h"
  
 int main() {
@@ -10021,7 +10029,7 @@
 #endif 
 ; return 0; }
 EOF
-if { (eval echo configure:10025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    # TryCompile action if true
 cf_cv_ebcdic=yes 
@@ -10055,7 +10063,7 @@
 if test $cf_cv_screen != slang ; then
 	
 echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
-echo "configure:10059: checking if curses supports alternate-character set" >&5
+echo "configure:10067: checking if curses supports alternate-character set" >&5
 if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10063,7 +10071,7 @@
 for mapname in acs_map _acs_map
 do
 	cat > conftest.$ac_ext <<EOF
-#line 10067 "configure"
+#line 10075 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10072,7 +10080,7 @@
 chtype x = $mapname['l']; $mapname['m'] = 0
 ; return 0; }
 EOF
-if { (eval echo configure:10076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_alt_char_set=$mapname
 	 break
@@ -10095,13 +10103,13 @@
 
 	
 echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
-echo "configure:10099: checking if curses supports fancy attributes" >&5
+echo "configure:10107: checking if curses supports fancy attributes" >&5
 if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10105 "configure"
+#line 10113 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10114,7 +10122,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fancy_curses=yes
 else
@@ -10134,7 +10142,7 @@
 
 
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10138: checking for ncurses version" >&5
+echo "configure:10146: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10159,7 +10167,7 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:10163: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:10171: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -10168,7 +10176,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 10172 "configure"
+#line 10180 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10191,7 +10199,7 @@
 	exit(0);
 }
 EOF
-if { (eval echo configure:10195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10211,13 +10219,13 @@
 
 if test "$cf_cv_ncurses_version" != no ; then
 echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
-echo "configure:10215: checking for obsolete/broken version of ncurses" >&5
+echo "configure:10223: checking for obsolete/broken version of ncurses" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 10221 "configure"
+#line 10229 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10231,7 +10239,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_broken=no
 else
@@ -10256,13 +10264,13 @@
 
 	
 echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:10260: checking if curses supports color attributes" >&5
+echo "configure:10268: checking if curses supports color attributes" >&5
 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10266 "configure"
+#line 10274 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10277,7 +10285,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_color_curses=yes
 else
@@ -10304,7 +10312,7 @@
 
 	
 echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:10308: checking declaration of size-change" >&5
+echo "configure:10316: checking declaration of size-change" >&5
 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10318,7 +10326,7 @@
     CFLAGS="$cf_save_CFLAGS"
     test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts"
     cat > conftest.$ac_ext <<EOF
-#line 10322 "configure"
+#line 10330 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if HAVE_TERMIOS_H
@@ -10357,7 +10365,7 @@
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sizechange=yes
 else
@@ -10389,20 +10397,20 @@
 
 	
 echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
-echo "configure:10393: checking if ttytype is declared in curses library" >&5
+echo "configure:10401: checking if ttytype is declared in curses library" >&5
 if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 10399 "configure"
+#line 10407 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 char *x = &ttytype[1]; *x = 1
 ; return 0; }
 EOF
-if { (eval echo configure:10406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_ttytype=yes
 else
@@ -10430,12 +10438,12 @@
 	
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10434: checking for $ac_func" >&5
+echo "configure:10442: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10439 "configure"
+#line 10447 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10458,7 +10466,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10488,7 +10496,7 @@
 
 
 echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6
-echo "configure:10492: checking if configuration info should be browsable" >&5
+echo "configure:10500: checking if configuration info should be browsable" >&5
 
 # Check whether --enable-config-info or --disable-config-info was given.
 if test "${enable_config_info+set}" = set; then
@@ -10512,7 +10520,7 @@
 
 
 echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6
-echo "configure:10516: checking if new-style forms-based options screen should be used" >&5
+echo "configure:10524: checking if new-style forms-based options screen should be used" >&5
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
 if test "${enable_forms_options+set}" = set; then
@@ -10536,7 +10544,7 @@
 
 
 echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6
-echo "configure:10540: checking if old-style options menu should be used" >&5
+echo "configure:10548: checking if old-style options menu should be used" >&5
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
 if test "${enable_menu_options+set}" = set; then
@@ -10560,7 +10568,7 @@
 
 
 echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6
-echo "configure:10564: checking if experimental address-list page should be used" >&5
+echo "configure:10572: checking if experimental address-list page should be used" >&5
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
 if test "${enable_addrlist_page+set}" = set; then
@@ -10584,7 +10592,7 @@
 
 
 echo $ac_n "checking if experimental alternative line-edit bindings should be used""... $ac_c" 1>&6
-echo "configure:10588: checking if experimental alternative line-edit bindings should be used" >&5
+echo "configure:10596: checking if experimental alternative line-edit bindings should be used" >&5
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
 if test "${enable_alt_bindings+set}" = set; then
@@ -10608,7 +10616,7 @@
 
 
 echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6
-echo "configure:10612: checking if color-style code should be used" >&5
+echo "configure:10620: checking if color-style code should be used" >&5
 
 # Check whether --enable-color-style or --disable-color-style was given.
 if test "${enable_color_style+set}" = set; then
@@ -10656,7 +10664,7 @@
 	echo "$ac_t""yes" 1>&6
 
 	echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6
-echo "configure:10660: checking for location of style-sheet file" >&5
+echo "configure:10668: checking for location of style-sheet file" >&5
 	LYNX_LSS_FILE=$cf_libdir/lynx.lss
 	cat >> confdefs.h <<EOF
 #define LYNX_LSS_FILE "$LYNX_LSS_FILE"
@@ -10674,7 +10682,7 @@
 
 if test "$use_dft_colors" != no ; then
 echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6
-echo "configure:10678: checking if you want to use default-colors" >&5
+echo "configure:10686: checking if you want to use default-colors" >&5
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
 if test "${enable_default_colors+set}" = set; then
@@ -10699,7 +10707,7 @@
 fi
 
 echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6
-echo "configure:10703: checking if experimental keyboard-layout logic should be used" >&5
+echo "configure:10711: checking if experimental keyboard-layout logic should be used" >&5
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
 if test "${enable_kbd_layout+set}" = set; then
@@ -10723,7 +10731,7 @@
 
 
 echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6
-echo "configure:10727: checking if experimental JavaScript support should be used" >&5
+echo "configure:10735: checking if experimental JavaScript support should be used" >&5
 
 # Check whether --enable-libjs or --disable-libjs was given.
 if test "${enable_libjs+set}" = set; then
@@ -10747,7 +10755,7 @@
 
 
 echo $ac_n "checking if experimental persistent-cookie logic should be used""... $ac_c" 1>&6
-echo "configure:10751: checking if experimental persistent-cookie logic should be used" >&5
+echo "configure:10759: checking if experimental persistent-cookie logic should be used" >&5
 
 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
 if test "${enable_persistent_cookies+set}" = set; then
@@ -10771,7 +10779,7 @@
 
 
 echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6
-echo "configure:10775: checking if html source should be colorized" >&5
+echo "configure:10783: checking if html source should be colorized" >&5
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
 if test "${enable_prettysrc+set}" = set; then
@@ -10795,7 +10803,7 @@
 
 
 echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6
-echo "configure:10799: checking if source caching should be used" >&5
+echo "configure:10807: checking if source caching should be used" >&5
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
 if test "${enable_source_cache+set}" = set; then
@@ -10822,7 +10830,7 @@
 
 
 echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6
-echo "configure:10826: checking if you want to use extended HTML DTD logic" >&5
+echo "configure:10834: checking if you want to use extended HTML DTD logic" >&5
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
 if test "${enable_extended_dtd+set}" = set; then
@@ -10846,7 +10854,7 @@
 
 
 echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6
-echo "configure:10850: checking if partial-display should be used" >&5
+echo "configure:10858: checking if partial-display should be used" >&5
 
 # Check whether --enable-partial or --disable-partial was given.
 if test "${enable_partial+set}" = set; then
@@ -10870,7 +10878,7 @@
 
 
 echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6
-echo "configure:10874: checking if you want to use external commands" >&5
+echo "configure:10882: checking if you want to use external commands" >&5
 
 # Check whether --enable-externs or --disable-externs was given.
 if test "${enable_externs+set}" = set; then
@@ -10894,7 +10902,7 @@
 
 
 echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6
-echo "configure:10898: checking if you want to use setfont support" >&5
+echo "configure:10906: checking if you want to use setfont support" >&5
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
 if test "${enable_font_switch+set}" = set; then
@@ -10918,7 +10926,7 @@
 
 
 echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6
-echo "configure:10922: checking if you want cgi-link support" >&5
+echo "configure:10930: checking if you want cgi-link support" >&5
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
 if test "${enable_cgi_links+set}" = set; then
@@ -10937,7 +10945,7 @@
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6
-echo "configure:10941: checking if you want exec-links support" >&5
+echo "configure:10949: checking if you want exec-links support" >&5
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
 if test "${enable_exec_links+set}" = set; then
@@ -10956,7 +10964,7 @@
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6
-echo "configure:10960: checking if you want exec-scripts support" >&5
+echo "configure:10968: checking if you want exec-scripts support" >&5
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
 if test "${enable_exec_scripts+set}" = set; then
@@ -10975,7 +10983,7 @@
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6
-echo "configure:10979: checking if you want internal-links feature" >&5
+echo "configure:10987: checking if you want internal-links feature" >&5
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
 if test "${enable_internal_links+set}" = set; then
@@ -10999,7 +11007,7 @@
 
 
 echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6
-echo "configure:11003: checking if you want to fork NSL requests" >&5
+echo "configure:11011: checking if you want to fork NSL requests" >&5
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
 if test "${enable_nsl_fork+set}" = set; then
@@ -11023,7 +11031,7 @@
 
 
 echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6
-echo "configure:11027: checking if you want to log URL requests via syslog" >&5
+echo "configure:11035: checking if you want to log URL requests via syslog" >&5
 
 # Check whether --enable-syslog or --disable-syslog was given.
 if test "${enable_syslog+set}" = set; then
@@ -11047,7 +11055,7 @@
 
 
 echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6
-echo "configure:11051: checking if you want to underline links" >&5
+echo "configure:11059: checking if you want to underline links" >&5
 
 # Check whether --enable-underlines or --disable-underlines was given.
 if test "${enable_underlines+set}" = set; then
@@ -11071,7 +11079,7 @@
 
 
 echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6
-echo "configure:11075: checking if help files should be gzip'ed" >&5
+echo "configure:11083: checking if help files should be gzip'ed" >&5
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
 if test "${enable_gzip_help+set}" = set; then
@@ -11100,7 +11108,7 @@
 
 
 echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6
-echo "configure:11104: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "configure:11112: checking if you want to use zlib for decompression of some gzip files" >&5
 
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -11117,12 +11125,12 @@
 	cf_cv_have_lib_z=no
 	cf_libdir=""
 	echo $ac_n "checking for gzopen""... $ac_c" 1>&6
-echo "configure:11121: checking for gzopen" >&5
+echo "configure:11129: checking for gzopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11126 "configure"
+#line 11134 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gzopen(); below.  */
@@ -11145,7 +11153,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gzopen=yes"
 else
@@ -11165,17 +11173,17 @@
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:11169: checking for gzopen in -lz" >&5
+echo "configure:11177: checking for gzopen in -lz" >&5
 		LIBS="-lz $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 11172 "configure"
+#line 11180 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:11179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 cf_cv_have_lib_z=yes
@@ -11202,17 +11210,17 @@
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6
-echo "configure:11206: checking for -lz in $cf_libdir" >&5
+echo "configure:11214: checking for -lz in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lz $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 11209 "configure"
+#line 11217 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:11216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 cf_cv_have_lib_z=yes
@@ -11248,7 +11256,7 @@
 fi
 
 echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6
-echo "configure:11252: checking if you want to exclude FINGER code" >&5
+echo "configure:11260: checking if you want to exclude FINGER code" >&5
 
 # Check whether --enable-finger or --disable-finger was given.
 if test "${enable_finger+set}" = set; then
@@ -11272,7 +11280,7 @@
 
 
 echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6
-echo "configure:11276: checking if you want to exclude GOPHER code" >&5
+echo "configure:11284: checking if you want to exclude GOPHER code" >&5
 
 # Check whether --enable-gopher or --disable-gopher was given.
 if test "${enable_gopher+set}" = set; then
@@ -11296,7 +11304,7 @@
 
 
 echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6
-echo "configure:11300: checking if you want to exclude NEWS code" >&5
+echo "configure:11308: checking if you want to exclude NEWS code" >&5
 
 # Check whether --enable-news or --disable-news was given.
 if test "${enable_news+set}" = set; then
@@ -11320,7 +11328,7 @@
 
 
 echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6
-echo "configure:11324: checking if you want to exclude FTP code" >&5
+echo "configure:11332: checking if you want to exclude FTP code" >&5
 
 # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
@@ -11349,7 +11357,7 @@
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
 echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6
-echo "configure:11353: checking if directory-editor code should be used" >&5
+echo "configure:11361: checking if directory-editor code should be used" >&5
 
 # Check whether --enable-dired or --disable-dired was given.
 if test "${enable_dired+set}" = set; then
@@ -11375,7 +11383,7 @@
 
 
 	echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6
-echo "configure:11379: checking if you wish to allow extracting from archives via DirEd" >&5
+echo "configure:11387: checking if you wish to allow extracting from archives via DirEd" >&5
 	
 # Check whether --enable-dired-archive or --disable-dired-archive was given.
 if test "${enable_dired_archive+set}" = set; then
@@ -11394,7 +11402,7 @@
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow users to redefine DirEd keys""... $ac_c" 1>&6
-echo "configure:11398: checking if you wish to allow users to redefine DirEd keys" >&5
+echo "configure:11406: checking if you wish to allow users to redefine DirEd keys" >&5
 	
 # Check whether --enable-dired-override or --disable-dired-override was given.
 if test "${enable_dired_override+set}" = set; then
@@ -11420,7 +11428,7 @@
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6
-echo "configure:11424: checking if you wish to allow permissions commands via DirEd" >&5
+echo "configure:11432: checking if you wish to allow permissions commands via DirEd" >&5
 	
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
 if test "${enable_dired_permit+set}" = set; then
@@ -11446,7 +11454,7 @@
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6
-echo "configure:11450: checking if you wish to allow executable-permission commands via DirEd" >&5
+echo "configure:11458: checking if you wish to allow executable-permission commands via DirEd" >&5
 	
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
 if test "${enable_dired_xpermit+set}" = set; then
@@ -11465,7 +11473,7 @@
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11469: checking if you wish to allow "tar" commands from DirEd" >&5
+echo "configure:11477: checking if you wish to allow "tar" commands from DirEd" >&5
 	
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
 if test "${enable_dired_tar+set}" = set; then
@@ -11491,7 +11499,7 @@
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11495: checking if you wish to allow "uudecode" commands from DirEd" >&5
+echo "configure:11503: checking if you wish to allow "uudecode" commands from DirEd" >&5
 	
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
 if test "${enable_dired_uudecode+set}" = set; then
@@ -11517,7 +11525,7 @@
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11521: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
+echo "configure:11529: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
 	
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
 if test "${enable_dired_zip+set}" = set; then
@@ -11543,7 +11551,7 @@
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:11547: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
+echo "configure:11555: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
 	
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
 if test "${enable_dired_gzip+set}" = set; then
@@ -11570,7 +11578,7 @@
 fi
 
 echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6
-echo "configure:11574: checking if you want long-directory listings" >&5
+echo "configure:11582: checking if you want long-directory listings" >&5
 
 # Check whether --enable-long-list or --disable-long-list was given.
 if test "${enable_long_list+set}" = set; then
@@ -11596,7 +11604,7 @@
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6
-echo "configure:11600: checking if parent-directory references are permitted" >&5
+echo "configure:11608: checking if parent-directory references are permitted" >&5
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
 if test "${enable_parent_dir_refs+set}" = set; then
@@ -11616,7 +11624,7 @@
 
 
 echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6
-echo "configure:11620: checking if we can include termio.h with curses" >&5
+echo "configure:11628: checking if we can include termio.h with curses" >&5
 if eval "test \"`echo '$''{'cf_cv_termio_and_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11625,7 +11633,7 @@
     CFLAGS="$CFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat > conftest.$ac_ext <<EOF
-#line 11629 "configure"
+#line 11637 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -11634,7 +11642,7 @@
 putchar(0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:11638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_curses=yes
 else
@@ -11854,6 +11862,7 @@
 s%@l@%$l%g
 s%@NLS_DATADIR@%$NLS_DATADIR%g
 s%@USE_OUR_MESSAGES@%$USE_OUR_MESSAGES%g
+s%@INTLDIR_CPPFLAGS@%$INTLDIR_CPPFLAGS%g
 s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g
 s%@MSG_DIR_MAKE@%$MSG_DIR_MAKE%g
 s%@CHMOD@%$CHMOD%g
Index: configure.in
--- 2.8.2dev.25/configure.in	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/configure.in	Wed May  5 18:33:59 1999
@@ -120,6 +120,7 @@
 [PREFIX/DATADIR],
 [$prefix/$DATADIRNAME])
 
+INTLDIR_CPPFLAGS=
 INTLDIR_MAKE=
 MSG_DIR_MAKE=
 SUB_MAKEFILE=
@@ -157,6 +158,12 @@
 		SUB_MAKEFILE=
 	fi
 fi
+
+if test -z "$INTLDIR_MAKE" ; then
+	INTLDIR_CPPFLAGS='-I$(top_srcdir)/intl'
+fi
+
+AC_SUBST(INTLDIR_CPPFLAGS)
 AC_SUBST(INTLDIR_MAKE)
 AC_SUBST(MSG_DIR_MAKE)
 
@@ -478,6 +485,7 @@
 	putenv \
 	readdir \
 	strerror \
+	unsetenv \
 	waitpid \
 )
 AC_REPLACE_FUNCS( \
@@ -704,13 +712,13 @@
 
 AC_MSG_CHECKING(if you want exec-links support)
 CF_ARG_ENABLE(exec-links,
-[  --enable-exec-links     support cgi links w/o a http daemon],
+[  --enable-exec-links     allow lynx to execute programs accessed via a link],
 	[AC_DEFINE(EXEC_LINKS)])
 AC_MSG_RESULT($enableval)
 
 AC_MSG_CHECKING(if you want exec-scripts support)
 CF_ARG_ENABLE(exec-scripts,
-[  --enable-exec-scripts   support cgi links w/o a http daemon],
+[  --enable-exec-scripts   allow lynx to execute programs inferred from a link],
 	[AC_DEFINE(EXEC_SCRIPTS)])
 AC_MSG_RESULT($enableval)
 
Index: lynx.cfg
--- 2.8.2dev.25/lynx.cfg	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/lynx.cfg	Wed May  5 18:33:59 1999
@@ -46,8 +46,8 @@
 STARTFILE:http://lynx.browser.org/
 #
 # As an alternative, you may want to use a local URL.  A good choice for this is
-# the user's home directory: 
-#STARTFILE:file://localhost/~/ 
+# the user's home directory:
+#STARTFILE:file://localhost/~/
 #
 # Your choice of STARTFILE should reflect your site's needs, and be a URL that
 # you can connect to reliably.  Otherwise users will become confused and think
@@ -2010,11 +2010,11 @@
 # 1) The markup for HTML_ENTIRE will be emitted only once - it will surround
 # entire file source.
 # 2) The tagnames specified by TAGPEC should be valid html tag names.
-# 3) If the tag/class comblination given by TAGOPEN is not assigned a color
+# 3) If the tag/class combination given by TAGOPEN is not assigned a color
 #    style in lss file (for lynx compiled with lss support), that tag/class
 #    combination will be anyway emitted during internal html markup. Such
 #    combinations will be also reported to the trace log.
-# 4) Lexem 'tag' means everything contained in generalized angle brackets
+# 4) Lexeme 'tag' means everything contained in generalized angle brackets
 # 5) Angle brackets of html specials won't be surrounded by markup for ABRACKET
 #
 #         Examples:
Index: lynx_help/Lynx_users_guide.html
--- 2.8.2dev.25/lynx_help/Lynx_users_guide.html	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/lynx_help/Lynx_users_guide.html	Wed May  5 18:33:59 1999
@@ -395,7 +395,7 @@
 in this mode.  On the other hand, if the DOWNLOAD command is used,
 the only change will be that Lynx optionally puts
 <blockquote>
-&lt;!--X-URL: http://www.site.foo/path/to/file.html --&gt<BR>
+&lt;!--X-URL: http://www.site.foo/path/to/file.html --&gt;<BR>
 &lt;BASE href="http://www.site.foo/path/to/file.html"&gt;
 </blockquote>
 at the start of the file so that relative URLs in the document
@@ -547,7 +547,7 @@
      preferred document lan(G)uage: en
      preferred document c(H)arset : NONE
      display (C)haracter set      : ISO Latin 1
-     raw 8-bit or CJK m(O)de      : ON      show color (&)  : OFF
+     raw 8-bit or CJK m(O)de      : ON      show color (&amp;)  : OFF
      V)I keys: OFF    e(M)acs keys: OFF     sho(W) dot files: OFF
      popups for selec(T) fields   : ON      show cursor (@) : OFF
      K)eypad mode                 : Numbers act as arrows
@@ -1045,7 +1045,7 @@
 Similar to the bookmarks file is the jumps file: for an example,
 look in the <em>samples</em> subdirectory in the distribution package.
 To use the jumps command, create a <em>jumps file</em> with the same format
-as the sample file, but containing your own URLs & short-cut names.
+as the sample file, but containing your own URLs &amp; short-cut names.
 Once you have done that, typing '<em>j</em>' prompts you to enter
 a short-cut name, which will take you straight to the URL
 associated with the short-cut in the jumps file,
@@ -1381,7 +1381,7 @@
     so that hitting <em>Enter</em> with the cursor on the last line
     adds a new line to the TEXTAREA, with the cursor on it.<p>
 
-    Some flavors of UNIX, shells & terminal settings require
+    Some flavors of UNIX, shells &amp; terminal settings require
     that you enter <em>^v^ve</em> in order to start the editor,
     as they also use <em>^v</em> as default command-line quote key
     (called `lnext' in stty man pages and `stty -a' output);
Index: lynx_help/about_lynx.html
--- 2.8.2dev.25/lynx_help/about_lynx.html	Sat Dec 12 21:10:36 1998
+++ 2.8.2dev.26/lynx_help/about_lynx.html	Wed May  5 18:33:59 1999
@@ -6,10 +6,10 @@
 </HEAD>
 
 <BODY>
-<BANNER>
+<blockquote>
 [ <A HREF="lynx-dev.html">About Lynx-Dev</A> |
 <A HREF="http://www.flora.org/lynx-dev/html/">Lynx-Dev Archives</A> ]
-</BANNER>
+</blockquote>
 
 <h1><em>About Lynx</em></h1>
 
Index: lynx_help/keystrokes/environments.html
--- 2.8.2dev.25/lynx_help/keystrokes/environments.html	Mon Jan 18 05:29:20 1999
+++ 2.8.2dev.26/lynx_help/keystrokes/environments.html	Wed May  5 18:33:59 1999
@@ -232,7 +232,7 @@
        script, unless they are provided via a LYNXCGI_ENVIRONMENT
        statement in the configuration  file.   See  the  lynx.cfg
        file,    and    the    (draft)   CGI   1.1   Specification
-       <http://Web.Golux.Com/coar/cgi/draft-coar-cgi-v11-00.txt>
+       &lt;http://Web.Golux.Com/coar/cgi/draft-coar-cgi-v11-00.txt&gt;
        for the definition and usage of these variables.
 
        The CGI Specification, and other associated documentation,
Index: lynx_help/keystrokes/follow_help.html
--- 2.8.2dev.25/lynx_help/keystrokes/follow_help.html	Wed Mar 17 20:17:11 1999
+++ 2.8.2dev.26/lynx_help/keystrokes/follow_help.html	Wed May  5 18:33:59 1999
@@ -106,7 +106,7 @@
 to skip ahead 3 pages, and <em>50g-</em> will move the
 current selection back 50 options.
 This will work whether or not <em>keypad mode</em> is
-<Links and form fields are numbered</em> since options
+<em>Links and form fields are numbered</em> since options
 are numbered internally.  If form field numbering is
 turned off, the option numbers won't appear on screen,
 but the user can still navigate using these commands.
Index: lynx_help/keystrokes/test_display.html
--- 2.8.2dev.25/lynx_help/keystrokes/test_display.html	Mon Nov 16 15:59:27 1998
+++ 2.8.2dev.26/lynx_help/keystrokes/test_display.html	Wed May  5 18:33:59 1999
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-<TITLE> Quick test for identifying display character set</TITLE>
+<TITLE>Quick test for identifying display character set</TITLE>
 </HEAD>
 <BODY>
 <h1 ALIGN=LEFT>Try this page with Lynx 2.7.2 or above:</h1>
Index: lynx_help/lynx-dev.html
--- 2.8.2dev.25/lynx_help/lynx-dev.html	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/lynx_help/lynx-dev.html	Wed May  5 18:33:59 1999
@@ -1,4 +1,4 @@
-<!DOCTYPE html public "-//IETF//DTD HTML 3.0//EN">
+<!DOCTYPE html public "-//IETF//DTD HTML 2.0//EN">
 <html>
 <head>
 <title>Lynx-Dev Discussion List</title>
@@ -6,13 +6,13 @@
 </head>
 
 <body>
-<banner>
+<blockquote>
 [ <a href="http://www.flora.org/lynx-dev/html/">Lynx-Dev Archive</a> |
 <a href="about_lynx.html">About Lynx</a> ]
-</banner>
+</blockquote>
 
 <h1><em>The Lynx Development Process</em></h1>
-
+<p>
 Lynx is maintained and improved by an international co-operative
 of volunteers.  Newcomers are welcome to join the group:
 you needn't be a super programmer, but you should be prepared
@@ -21,7 +21,7 @@
 to try to implement any suggestions you make.
 
 <h1><em>Lynx-Dev Discussion List</em></h1>
-
+<p>
 The developers communicate through a majordomo mailing list
 -- see below for details -- , which is open to interested users
 as well as programmers.  Topics include fixing bugs, increasing
@@ -32,7 +32,7 @@
 <a href="http://www.flora.org/lynx-dev/html/">&nbsp;the Archive</a>.
 
 <h1><em>Development Versions of Lynx</em></h1>
-
+<p>
 Besides <em>releases</em>, which are stable versions of Lynx
 which come out once or twice a year and can be obtained
 from <a href="http://www.slcc.edu/lynx/release">the release site</a>,
@@ -44,35 +44,35 @@
 <a href="http://sol.slcc.edu/lynx/current">the development site</a>.
 
 <h1><em>Subscribing to Lynx-Dev</em></h1>
-
+<p>
 If you are interested in joining the Lynx mailing list,
 send e-mail to <a href="mailto:majordomo@sig.net">&nbsp;majordomo@sig.net</a>
-with only the following request in the body of your message:<p>
-
-&nbsp;&nbsp;subscribe lynx-dev (address)<p>
-
+with only the following request in the body of your message:
+<p>
+&nbsp;&nbsp;subscribe lynx-dev (address)
+<p>
 where your e-address is optional if it can be obtained correctly
 from the mail headers of your subscription request. You will need
 to answer one follow-up question to confirm you want to subscribe.
 Majordomo will then enroll you and send all messages
 which you address to <em>lynx-dev@sig.net</em> to all subscribers;
-you will also receive all messages sent by other subscribers.<p>
-
+you will also receive all messages sent by other subscribers.
+<p>
 NOTE: Subject headers are ignored when (un)subscribing.
 
 <h1><em>Unsubscribing from Lynx-Dev</em></h1>
-
+<p>
 To <em>unsubscribe</em>, send an e-mail to
 <a href="mailto:majordomo@sig.net">&nbsp;majordomo@sig.net</a>
-with only the following request in the body of your message:<p>
-
-&nbsp;&nbsp;unsubscribe lynx-dev (address)<p>
-
+with only the following request in the body of your message:
+<p>
+&nbsp;&nbsp;unsubscribe lynx-dev (address)
+<p>
 where your e-address is optional if it can be obtained correctly
 from the mail headers of your subscription request.
 
 <h1><em>Casual Inquiries</em></h1>
-
+<p>
 Anyone may ask a question or offer a comment by sending e-mail
 to <a href="mailto:lynx-dev@sig.net">&nbsp;the list</a>.
 Since all subscribers are volunteers,
@@ -87,7 +87,7 @@
 For best results, subscribe as described above.
 
 <h1><em>Subscribing to Lynx-Dev-Contrib</em></h1>
-
+<p>
 If you simply want to contribute e-mail to the list
 without receiving the sometimes heavy discussion as well,
 you can subscribe to <em>lynx-dev-contrib</em> instead.
@@ -96,23 +96,23 @@
 but no e-mail will be sent from the list to you. If you have
 multiple accounts from which you want to post to the list,
 subscribe one of them to lynx-dev to receive the list mail
-and the others to lynx-dev-contrib.<p>
-
+and the others to lynx-dev-contrib.
+<p>
 To subscribe to lynx-dev-contrib, send e-mail to
 <a href="mailto:majordomo@sig.net">&nbsp;majordomo@sig.net</a>
-with only the following request in the body of your message:<p>
-
+with only the following request in the body of your message:
+<p>
 &nbsp;&nbsp;subscribe lynx-dev-contrib (address)
 
 <h1><em>Majordomo Commands</em></h1>
-
+<p>
 To receive a brief description of majordomo <em>commands</em>,
 send e-mail to
 <a href="mailto:majordomo@sig.net">&nbsp;majordomo@sig.net</a>
-with only the following request in the body of your message:<p>
-
-&nbsp;&nbsp;help<p>
-
+with only the following request in the body of your message:
+<p>
+&nbsp;&nbsp;help
+<p>
 You will receive by return e-mail a list of commands.
 Further information is available from the
 <a href="http://www.greatcircle.com/majordomo/">&nbsp;majordomo website</a>.
@@ -125,7 +125,7 @@
 causing irritation by cluttering their mailboxes.
 
 <h1><em>The Lynx-Dev Archive</em></h1>
-
+<p>
 Messages posted to lynx-dev are archived in html format
 so that you can view them using Lynx: go to the
 <a href="http://www.flora.org/lynx-dev/html/">HTML Archive</a>.
Index: lynx_help/lynx_url_support.html
--- 2.8.2dev.25/lynx_help/lynx_url_support.html	Wed Mar 17 20:17:11 1999
+++ 2.8.2dev.26/lynx_help/lynx_url_support.html	Wed May  5 18:33:59 1999
@@ -6,7 +6,7 @@
 </HEAD>
 
 <BODY>
-<BANNER>
+<blockquote>
 <em>[</em><a href="#http">http, https</a> <em>|</em>
 <a href="#telnet">telnet, tn3270, rlogin</a> <em>|</em>
 <a href="#gopher">gopher</a> <em>|</em>
@@ -21,13 +21,13 @@
 <a href="#exec">lynxexec, lynxprog</a> <em>|</em>
 <a href="#cgi">lynxcgi</a><em>|</em>
 <a href="#internal">internal</a><em>]</em>
-</BANNER>
+</blockquote>
 
 <H1><em>URL Schemes Supported in Lynx</em></H1>
 
 Lynx handles a number of URL types, that are enumerated below.  For
 more details about URLs (Uniform Resource Locators) see <em>RFC1738</em>:
-<ul plain>
+<ul>
 <li><a href="http://www.w3.org/Addressing/rfc1738.txt"
 >http://www.w3.org/Addressing/rfc1738.txt</a>
 <li><a href="ftp://ds.internic.net/rfc/rfc1738.txt"
@@ -37,7 +37,7 @@
 <p>Lynx resolves partial or relative URLs in documents with respect to
 the BASE if one was specified, otherwise with respect to the document's
 absolute URL, using the rules described in <em>RFC1808</em>:
-<ul plain>
+<ul>
 <li><a href="http://www.w3.org/Addressing/rfc1808.txt"
 >http://www.w3.org/Addressing/rfc1808.txt</a>
 <li><a href="ftp://ds.internic.net/rfc/rfc1808.txt"
@@ -45,7 +45,7 @@
 </ul>
 
 and in subsequent drafts of the <em>IETF</em>:
-<ul plain>
+<ul>
 <li><a href="http://www.ics.uci.edu/pub/ietf/uri/"
 >Uniform Resource Identifiers (URI) Working Group</a>
 </ul>
Index: po/POTFILES.in
--- 2.8.2dev.25/po/POTFILES.in	Thu Dec 24 04:27:23 1998
+++ 2.8.2dev.26/po/POTFILES.in	Wed May  5 18:33:59 1999
@@ -6,10 +6,13 @@
 WWW/Library/Implementation/HTAABrow.c
 WWW/Library/Implementation/HTAccess.c
 WWW/Library/Implementation/HTFTP.c
+WWW/Library/Implementation/HTFile.c
 WWW/Library/Implementation/HTFinger.c
+WWW/Library/Implementation/HTGopher.c
 WWW/Library/Implementation/HTNews.c
 WWW/Library/Implementation/HTTCP.c
 WWW/Library/Implementation/HTTP.c
+WWW/Library/Implementation/HTTelnet.c
 WWW/Library/Implementation/HTWAIS.c
 WWW/Library/Implementation/HTWSRC.c
 src/GridText.c
@@ -36,6 +39,7 @@
 src/LYStyle.c
 src/LYTraversal.c
 src/LYUpload.c
+src/LYUtils.c
 src/LYrcFile.c
 
 # end of file POTFILE.in
Index: po/lynx.pot
--- 2.8.2dev.25/po/lynx.pot	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/po/lynx.pot	Wed May  5 18:33:59 1999
@@ -1,10 +1,11 @@
+#: src/LYBookmark.c:346
 msgid ""
 msgstr ""
-"Date: 1999-04-22 14:07:27-0400\n"
+"Date: 1999-05-05 06:49:42-0400\n"
 "From: Thomas Dickey,,, <tom@dickey-ppp>\n"
 "Content-Type: text/plain; charset=\n"
 "Xgettext-Options: --default-domain=lynx --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
-"Files: LYMessages.c WWW/Library/Implementation/HTAABrow.c WWW/Library/Implementation/HTAccess.c WWW/Library/Implementation/HTFTP.c WWW/Library/Implementation/HTFinger.c WWW/Library/Implementation/HTNews.c WWW/Library/Implementation/HTTCP.c WWW/Library/Implementation/HTTP.c WWW/Library/Implementation/HTWAIS.c WWW/Library/Implementation/HTWSRC.c src/GridText.c src/HTAlert.c src/HTML.c src/LYBookmark.c src/LYCgi.c src/LYClean.c src/LYCookie.c src/LYCurses.c src/LYDownload.c src/LYHistory.c src/LYLeaks.c src/LYList.c src/LYLocal.c src/LYMail.c src/LYMain.c src/LYMainLoop.c src/LYNews.c src/LYOptions.c src/LYPrint.c src/LYReadCFG.c src/LYShowInfo.c src/LYStyle.c src/LYTraversal.c src/LYUpload.c src/LYrcFile.c\n"
+"Files: LYMessages.c WWW/Library/Implementation/HTAABrow.c WWW/Library/Implementation/HTAccess.c WWW/Library/Implementation/HTFTP.c WWW/Library/Implementation/HTFile.c WWW/Library/Implementation/HTFinger.c WWW/Library/Implementation/HTGopher.c WWW/Library/Implementation/HTNews.c WWW/Library/Implementation/HTTCP.c WWW/Library/Implementation/HTTP.c WWW/Library/Implementation/HTTelnet.c WWW/Library/Implementation/HTWAIS.c WWW/Library/Implementation/HTWSRC.c src/GridText.c src/HTAlert.c src/HTML.c src/LYBookmark.c src/LYCgi.c src/LYClean.c src/LYCookie.c src/LYCurses.c src/LYDownload.c src/LYHistory.c src/LYLeaks.c src/LYList.c src/LYLocal.c src/LYMail.c src/LYMain.c src/LYMainLoop.c src/LYNews.c src/LYOptions.c src/LYPrint.c src/LYReadCFG.c src/LYShowInfo.c src/LYStyle.c src/LYTraversal.c src/LYUpload.c src/LYUtils.c src/LYrcFile.c\n"
 
 #: LYMessages.c:24
 msgid "Alert!: %s"
@@ -2034,14 +2035,14 @@
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:662 src/LYNews.c:329
+#: LYMessages.c:662 src/LYNews.c:331
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:664 src/LYNews.c:330
+#: LYMessages.c:664 src/LYNews.c:332
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2587,27 +2588,23 @@
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:981
+#: WWW/Library/Implementation/HTAccess.c:975
 msgid "Loading incomplete."
 msgstr ""
 
-#.
-#. **	If you get this, then please find which routine is returning
-#. **	a positive unrecognized error code!
-#.
-#: WWW/Library/Implementation/HTAccess.c:1011
+#: WWW/Library/Implementation/HTAccess.c:1005
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1013
+#: WWW/Library/Implementation/HTAccess.c:1007
 msgid "**** HTAccess: Internal software error.  Please mail lynx_dev@sig.net!\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1014
+#: WWW/Library/Implementation/HTAccess.c:1008
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1027
+#: WWW/Library/Implementation/HTAccess.c:1021
 msgid "Unable to access document."
 msgstr ""
 
@@ -2648,6 +2645,15 @@
 msgid "Receiving FTP file."
 msgstr ""
 
+#. lines counter
+#: WWW/Library/Implementation/HTFile.c:1561
+msgid "Reading directory..."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFile.c:1643
+msgid "OK"
+msgstr ""
+
 #: WWW/Library/Implementation/HTFinger.c:275
 msgid "Could not set up finger connection."
 msgstr ""
@@ -2668,6 +2674,11 @@
 msgid "No response from finger server."
 msgstr ""
 
+#. finger is disabled
+#: WWW/Library/Implementation/HTGopher.c:1727
+msgid "Unable to access document!"
+msgstr ""
+
 #: WWW/Library/Implementation/HTNews.c:364
 msgid "Username for news host '%s':"
 msgstr ""
@@ -2777,7 +2788,7 @@
 msgid "Looking up %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1360
+#: WWW/Library/Implementation/HTTCP.c:1360 WWW/Library/Implementation/HTTelnet.c:99
 msgid "Invalid hostname %s"
 msgstr ""
 
@@ -2901,6 +2912,10 @@
 msgid "Unknown status reply from server!"
 msgstr ""
 
+#: WWW/Library/Implementation/HTTelnet.c:97
+msgid "remote %s session:"
+msgstr ""
+
 #: WWW/Library/Implementation/HTWAIS.c:164
 msgid "Could not connect to WAIS server."
 msgstr ""
@@ -3075,7 +3090,7 @@
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr ""
 
-#: src/GridText.c:4005 src/GridText.c:4012 src/LYList.c:248
+#: src/GridText.c:4005 src/GridText.c:4012 src/LYList.c:260
 msgid "unknown field or link"
 msgstr ""
 
@@ -3139,7 +3154,7 @@
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:8814
+#: src/GridText.c:8801
 msgid "Submitting %s"
 msgstr ""
 
@@ -3175,23 +3190,23 @@
 msgid "no"
 msgstr ""
 
-#: src/HTML.c:5809
+#: src/HTML.c:5828
 msgid "Description:"
 msgstr ""
 
-#: src/HTML.c:5814
+#: src/HTML.c:5833
 msgid "(none)"
 msgstr ""
 
-#: src/HTML.c:5818
+#: src/HTML.c:5837
 msgid "Filepath:"
 msgstr ""
 
-#: src/HTML.c:5823
+#: src/HTML.c:5842
 msgid "(unknown)"
 msgstr ""
 
-#: src/HTML.c:7108
+#: src/HTML.c:7127
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
@@ -3203,23 +3218,17 @@
 "     been remapped by you or your system administrator."
 msgstr ""
 
-#: src/LYBookmark.c:338
+#: src/LYBookmark.c:339
 msgid ""
 "     You can delete links using the remove bookmark command.  It is usually\n"
 "     the 'R' key but may have been remapped by you or your system\n"
-"     administrator.<br>\n"
+"     administrator."
+msgstr ""
+
+#: src/LYBookmark.c:343
+msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
-"     outdated or invalid links, or to change their order.\n"
-"\n"
-"<!--\n"
-"Note: if you edit this file manually\n"
-"      you should not change the format within the lines\n"
-"      or add other HTML markup.\n"
-"      Make sure any bookmark link saved as a single line\n"
-"-->\n"
-"\n"
-"     <p>\n"
-"<ol>\n"
+"     outdated or invalid links, or to change their order."
 msgstr ""
 
 #.
@@ -3255,11 +3264,14 @@
 msgid "(From Cookie Jar)"
 msgstr ""
 
-#: src/LYCookie.c:2559
+#: src/LYCookie.c:2562
 msgid "(from a previous session)"
 msgstr ""
 
-#: src/LYCookie.c:2619
+#.
+#. *	Show the Maximum Gobble Date. - FM
+#.
+#: src/LYCookie.c:2622
 msgid "Maximum Gobble Date:"
 msgstr ""
 
@@ -3335,27 +3347,27 @@
 msgid "No Name Given"
 msgstr ""
 
-#: src/LYHistory.c:402
+#: src/LYHistory.c:405
 msgid "You selected:"
 msgstr ""
 
-#: src/LYHistory.c:426 src/LYHistory.c:594
+#: src/LYHistory.c:429 src/LYHistory.c:597
 msgid "(no address)"
 msgstr ""
 
-#: src/LYHistory.c:430
+#: src/LYHistory.c:433
 msgid " (internal)"
 msgstr ""
 
-#: src/LYHistory.c:432
+#: src/LYHistory.c:435
 msgid " (was internal)"
 msgstr ""
 
-#: src/LYHistory.c:521
+#: src/LYHistory.c:524
 msgid " (From History)"
 msgstr ""
 
-#: src/LYHistory.c:558
+#: src/LYHistory.c:561
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr ""
 
@@ -3395,27 +3407,27 @@
 msgid "Total memory leakage this run:"
 msgstr ""
 
-#: src/LYList.c:92
+#: src/LYList.c:93
 msgid "References in "
 msgstr ""
 
-#: src/LYList.c:93
+#: src/LYList.c:94
 msgid "this document:"
 msgstr ""
 
-#: src/LYList.c:99
+#: src/LYList.c:100
 msgid "Visible links:"
 msgstr ""
 
-#: src/LYList.c:189 src/LYList.c:309
+#: src/LYList.c:201 src/LYList.c:321
 msgid "Hidden links:"
 msgstr ""
 
-#: src/LYList.c:257
+#: src/LYList.c:269
 msgid "References"
 msgstr ""
 
-#: src/LYList.c:259
+#: src/LYList.c:271
 msgid "Visible links"
 msgstr ""
 
@@ -3679,31 +3691,31 @@
 msgstr ""
 
 #. VMS
-#: src/LYMail.c:735
+#: src/LYMail.c:736
 msgid "The link   %s :?: %s \n"
 msgstr ""
 
-#: src/LYMail.c:737
+#: src/LYMail.c:738
 msgid "called \"%s\"\n"
 msgstr ""
 
-#: src/LYMail.c:738
+#: src/LYMail.c:739
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr ""
 
-#: src/LYMail.c:739
+#: src/LYMail.c:740
 msgid "was requested but was not available."
 msgstr ""
 
-#: src/LYMail.c:740
+#: src/LYMail.c:741
 msgid "Thought you might want to know."
 msgstr ""
 
-#: src/LYMail.c:742
+#: src/LYMail.c:743
 msgid "This message was automatically generated by"
 msgstr ""
 
-#: src/LYMail.c:743
+#: src/LYMail.c:744
 msgid "Lynx ver. %s"
 msgstr ""
 
@@ -3727,82 +3739,79 @@
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr ""
 
-#.
-#. *	If the configuration file is not available,
-#. *	inform the user and exit.
-#.
-#: src/LYMain.c:1224
+#: src/LYMain.c:1225
 msgid ""
 "\n"
 "Configuration file %s is not available.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1240
+#.
+#. * Make sure we have the character sets declared.
+#. *	This will initialize the CHARTRANS handling. - KW
+#.
+#: src/LYMain.c:1241
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
 "\n"
 msgstr ""
 
-#.
-#. *	Make sure we have the edit map declared. - FM
-#.
-#: src/LYMain.c:1264
+#: src/LYMain.c:1265
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1307
+#: src/LYMain.c:1308
 msgid ""
 "\n"
 "Lynx file %s is not available.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1903
+#: src/LYMain.c:1904
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2549
+#: src/LYMain.c:2550
 msgid ""
 "\n"
 "%s Version %s (%.*s)\n"
 msgstr ""
 
-#: src/LYMain.c:2555
+#: src/LYMain.c:2562
 msgid "Built on %s %s %s\n"
 msgstr ""
 
-#: src/LYMain.c:2559
+#: src/LYMain.c:2566
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr ""
 
-#: src/LYMain.c:2561
+#: src/LYMain.c:2568
 msgid "Distributed under the GNU General Public License.\n"
 msgstr ""
 
-#: src/LYMain.c:2563
+#: src/LYMain.c:2570
 msgid ""
 "See http://lynx.browser.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:3092
+#: src/LYMain.c:3099
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:3093
+#: src/LYMain.c:3100
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:3301
+#: src/LYMain.c:3308
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:304 src/LYMainLoop.c:3816
+#: src/LYMainLoop.c:304 src/LYMainLoop.c:3830
 msgid "Entry into main screen"
 msgstr ""
 
@@ -3812,49 +3821,49 @@
 "lynx: Can't access startfile %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:746
+#: src/LYMainLoop.c:746 src/LYMainLoop.c:754
 msgid ""
 "\n"
 "lynx: Start file could not be found or is not text/html or text/plain\n"
 msgstr ""
 
-#: src/LYMainLoop.c:747
+#: src/LYMainLoop.c:747 src/LYMainLoop.c:755
 msgid "      Exiting...\n"
 msgstr ""
 
-#: src/LYMainLoop.c:1223
+#: src/LYMainLoop.c:1241
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:1411 src/LYMainLoop.c:1415
+#: src/LYMainLoop.c:1415 src/LYMainLoop.c:1419
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:3039
+#: src/LYMainLoop.c:3043
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr ""
 
-#.
-#. *	Make a name for this new URL.
-#.
-#: src/LYMainLoop.c:3747
+#: src/LYMainLoop.c:3761
 msgid "A URL specified by the user"
 msgstr ""
 
-#: src/LYMainLoop.c:3773
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3787
 msgid "Help Screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3797
+#: src/LYMainLoop.c:3811
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:5457
+#: src/LYMainLoop.c:5471
 msgid "charset for this document specified explicitely, sorry..."
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:179
+#: src/LYNews.c:180
 msgid "You will be posting to:"
 msgstr ""
 
@@ -3862,7 +3871,7 @@
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:188
+#: src/LYNews.c:189
 msgid ""
 "\n"
 "\n"
@@ -3874,14 +3883,14 @@
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:207
+#: src/LYNews.c:208
 msgid ""
 "\n"
 "\n"
 " Please provide or edit the Subject: header\n"
 msgstr ""
 
-#: src/LYNews.c:256
+#: src/LYNews.c:258
 msgid ""
 "\n"
 "\n"
@@ -3891,181 +3900,181 @@
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:328
+#: src/LYNews.c:330
 msgid ""
 "\n"
 "\n"
 " Please enter your message below."
 msgstr ""
 
-#: src/LYNews.c:362
+#: src/LYNews.c:364
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:654
+#: src/LYOptions.c:655
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:656
+#: src/LYOptions.c:657
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:4114
+#: src/LYOptions.c:4115
 msgid "Personal Preferences"
 msgstr ""
 
-#. Cookies: SELECT
-#: src/LYOptions.c:4117
+#: src/LYOptions.c:4118
 msgid "Cookies"
 msgstr ""
 
-#: src/LYOptions.c:4131
+#. Editor: INPUT
+#: src/LYOptions.c:4132
 msgid "Editor"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:4136
+#: src/LYOptions.c:4137
 msgid "Emacs keys"
 msgstr ""
 
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:4142
+#: src/LYOptions.c:4143
 msgid "Keypad mode"
 msgstr ""
 
-#: src/LYOptions.c:4172
+#. EXP_KEYBOARD_LAYOUT
+#. Mail Address: INPUT
+#: src/LYOptions.c:4173
 msgid "Personal mail address"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:4177
+#: src/LYOptions.c:4178
 msgid "Searching type"
 msgstr ""
 
-#: src/LYOptions.c:4188
+#: src/LYOptions.c:4189
 msgid "Show color"
 msgstr ""
 
-#: src/LYOptions.c:4227
+#. USE_SLANG || COLOR_CURSES
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:4228
 msgid "Show cursor"
 msgstr ""
 
-#: src/LYOptions.c:4233
+#. User Mode: SELECT
+#: src/LYOptions.c:4234
 msgid "User mode"
 msgstr ""
 
-#: src/LYOptions.c:4239
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:4240
 msgid "VI keys"
 msgstr ""
 
-#: src/LYOptions.c:4245
+#. Display Character Set: SELECT
+#: src/LYOptions.c:4246
 msgid "Display character set"
 msgstr ""
 
-#. X Display: INPUT
-#: src/LYOptions.c:4258
+#: src/LYOptions.c:4259
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Layout
 #.
-#: src/LYOptions.c:4264
+#: src/LYOptions.c:4265
 msgid "Document Layout"
 msgstr ""
 
-#: src/LYOptions.c:4281
+#: src/LYOptions.c:4282
 msgid "Assumed document character set"
 msgstr ""
 
-#.
-#. * Since CJK people hardly mixed with other world
-#. * we split the header to make it more readable:
-#. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
-#.
-#: src/LYOptions.c:4298
+#: src/LYOptions.c:4299
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:4300
+#: src/LYOptions.c:4301
 msgid "Raw 8-bit"
 msgstr ""
 
-#. HTML error recovery: SELECT
-#: src/LYOptions.c:4307
+#: src/LYOptions.c:4308
 msgid "HTML error recovery"
 msgstr ""
 
-#. Select Popups: ON/OFF
-#: src/LYOptions.c:4313
+#: src/LYOptions.c:4314
 msgid "Popups for select fields"
 msgstr ""
 
-#. Show Images: SELECT
-#: src/LYOptions.c:4319
+#: src/LYOptions.c:4320
 msgid "Show images"
 msgstr ""
 
-#: src/LYOptions.c:4333
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:4334
 msgid "Verbose images"
 msgstr ""
 
-#: src/LYOptions.c:4341
+#.
+#. * Bookmark Options
+#.
+#: src/LYOptions.c:4342
 msgid "Bookmark Options"
 msgstr ""
 
-#: src/LYOptions.c:4345
+#: src/LYOptions.c:4346
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:4362
+#: src/LYOptions.c:4363
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:4364
+#: src/LYOptions.c:4365
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:4367
+#: src/LYOptions.c:4368
 msgid "Bookmarks file"
 msgstr ""
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4378
+#: src/LYOptions.c:4379
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:4385
+#: src/LYOptions.c:4386
 msgid "Local directory sort criteria"
 msgstr ""
 
-#: src/LYOptions.c:4393
+#. Show dot files: ON/OFF
+#: src/LYOptions.c:4394
 msgid "Show dot files"
 msgstr ""
 
-#. Execution links: SELECT
-#: src/LYOptions.c:4401
+#: src/LYOptions.c:4402
 msgid "Execution links"
 msgstr ""
 
-#.
-#. * Headers transferred to remote server
-#.
-#: src/LYOptions.c:4422
+#: src/LYOptions.c:4423
 msgid "Headers transferred to remote server"
 msgstr ""
 
-#. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4425
+#: src/LYOptions.c:4426
 msgid "Preferred document character set"
 msgstr ""
 
-#: src/LYOptions.c:4430
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:4431
 msgid "Preferred document language"
 msgstr ""
 
-#: src/LYOptions.c:4436
+#. User Agent: INPUT
+#: src/LYOptions.c:4437
 msgid "User-Agent header"
 msgstr ""
 
@@ -4159,39 +4168,39 @@
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1270
+#: src/LYReadCFG.c:1285
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1272
+#: src/LYReadCFG.c:1287
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1273
+#: src/LYReadCFG.c:1288
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1710 src/LYReadCFG.c:1723
+#: src/LYReadCFG.c:1736 src/LYReadCFG.c:1749
 msgid "This is read from your lynx.cfg file,"
 msgstr ""
 
-#: src/LYReadCFG.c:1711 src/LYReadCFG.c:1724
+#: src/LYReadCFG.c:1737 src/LYReadCFG.c:1750
 msgid "please \"read\" distribution's"
 msgstr ""
 
-#: src/LYReadCFG.c:1717 src/LYReadCFG.c:1727
+#: src/LYReadCFG.c:1743 src/LYReadCFG.c:1753
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:1733
+#: src/LYReadCFG.c:1759
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:1742
+#: src/LYReadCFG.c:1768
 msgid "Your primary configuration"
 msgstr ""
 
-#: src/LYReadCFG.c:1751
+#: src/LYReadCFG.c:1777
 msgid "This is read from your lynx.cfg file:"
 msgstr ""
 
@@ -4418,6 +4427,10 @@
 msgid "Upload options:"
 msgstr ""
 
+#: src/LYUtils.c:4897
+msgid "Ignoring invalid HOME"
+msgstr ""
+
 #: src/LYrcFile.c:563
 msgid ""
 "Lynx User Defaults File\n"
@@ -4773,7 +4786,19 @@
 #. *  Local execution mode - only links in local files.
 #.
 #: src/LYrcFile.c:1014
-msgid "If run_execution_links_on_local_files is set \"on\" then all local\n"
+msgid ""
+"If run_execution_links_on_local_files is set \"on\" then all local\n"
+"execution links that are found in LOCAL files will be executed when they\n"
+"are selected.  This is different from run_all_execution_links in that\n"
+"only files that reside on the local system will have execution link\n"
+"permissions.\n"
+"\n"
+"WARNING - This is potentially dangerous.  Since you may view\n"
+"          information that is written by unknown and untrusted sources\n"
+"          there exists the possibility that Trojan horse links could be\n"
+"          written.  Trojan horse links could be written to erase files\n"
+"          or compromise security.  This should only be set to \"on\" if\n"
+"          you are viewing trusted source information.\n"
 msgstr ""
 
 #. defined(EXEC_LINKS) || defined(EXEC_SCRIPTS)
Index: src/HTML.c
--- 2.8.2dev.25/src/HTML.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/HTML.c	Wed May  5 18:33:59 1999
@@ -212,7 +212,7 @@
 /* FIXME:  this should be amended to do the substitution only when not in a
  * multibyte stream.
  */
-#if EXP_JAPANESE_SPACES
+#ifdef EXP_JAPANESE_SPACES
 #define FIX_JAPANESE_SPACES \
 	(HTCJK == CHINESE || HTCJK == JAPANESE || HTCJK == TAIPEI)
 	/* don't replace '\n' with ' ' if Chinese or Japanese - HN
@@ -435,8 +435,19 @@
 */
 PUBLIC void HTML_put_string ARGS2(HTStructured *, me, CONST char *, s)
 {
-   if (LYMapsOnly || s == NULL)
-      return;
+#ifdef USE_PSRC
+    char* translated_string = NULL;
+#endif
+
+    if (LYMapsOnly || s == NULL)
+	return;
+#ifdef USE_PSRC
+    if (psrc_convert_string) {
+	StrAllocCopy(translated_string,s);
+	TRANSLATE_AND_UNESCAPE_ENTITIES(&translated_string, TRUE, FALSE);
+	s = (CONST char *) translated_string;
+    };
+#endif
 
     switch (me->sp[0].tag_number) {
 
@@ -499,7 +510,7 @@
 			      (*p == ' ') || (*p == '\t')); p++)
 		    ;	/* Ignore leaders */
 		if (!*p)
-		    return;
+		    break;
 		UPDATE_STYLE;
 	    }
 	    for (; *p; p++) {
@@ -558,6 +569,12 @@
 	    } /* for */
 	}
     } /* end switch */
+#ifdef USE_PSRC
+    if (psrc_convert_string) {
+	psrc_convert_string = FALSE;
+	FREE(translated_string);
+    }
+#endif
 }
 
 /*	Buffer write
@@ -1365,8 +1382,9 @@
 				me->node_anchor,	/* Parent */
 				NULL,			/* Tag */
 				href,			/* Addresss */
-				temp ?
-       (HTLinkType*)HTAtom_for(temp) : INTERN_LT);	/* Type */
+				temp
+				   ? (HTLinkType*)HTAtom_for(temp)
+				   : INTERN_LT);	/* Type */
 	    FREE(temp);
 	    if ((dest = HTAnchor_parent(
 			    HTAnchor_followMainLink((HTAnchor*)me->CurrentA)
@@ -3515,7 +3533,8 @@
 	    }
 	    if (alt_string != NULL) {
 		TRANSLATE_AND_UNESCAPE_ENTITIES(&alt_string,
-						       me->UsePlainSpace, me->HiddenValue);
+						me->UsePlainSpace,
+						me->HiddenValue);
 		/*
 		 *  Make sure it's not just space(s). - FM
 		 */
Index: src/LYBookmark.c
--- 2.8.2dev.25/src/LYBookmark.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYBookmark.c	Wed May  5 18:33:59 1999
@@ -88,7 +88,7 @@
     /*
      *	Seek it in the home path. - FM
      */
-    LYAddPathToHome(filename_buffer, 
+    LYAddPathToHome(filename_buffer,
 		    sizeof(filename_buffer),
 		    BookmarkPage);
     CTRACE(tfp, "\nget_bookmark_filename: SEEKING %s\n   AS %s\n\n",
@@ -132,7 +132,7 @@
  *  file for handling as a Lynx bookmark file. - FM
  */
 PRIVATE char * convert_mosaic_bookmark_file ARGS1(
-	char *, 	filename_buffer)
+	char *,		filename_buffer)
 {
     static char newfile[LY_MAXPATH];
     FILE *fp, *nfp;
@@ -191,8 +191,8 @@
  *  to that file. - FM
  */
 PUBLIC void save_bookmark_link ARGS2(
-	char *, 	address,
-	char *, 	title)
+	char *,		address,
+	char *,		title)
 {
     FILE *fp;
     BOOLEAN first_time = FALSE;
@@ -308,9 +308,9 @@
 	/*
 	 *  Seek it in the home path. - FM
 	 */
-	LYAddPathToHome(filename_buffer, 
-			sizeof(filename_buffer), 
-			BookmarkPage); 
+	LYAddPathToHome(filename_buffer,
+			sizeof(filename_buffer),
+			BookmarkPage);
     }
     CTRACE(tfp, "\nsave_bookmark_link: SEEKING %s\n   AS %s\n\n",
 		BookmarkPage, filename_buffer);
@@ -334,20 +334,20 @@
     if (first_time) {
 	fprintf(fp,"<head>\n");
 	LYAddMETAcharsetToFD(fp, -1);
-	fprintf(fp,"<title>%s</title>\n</head>\n",BOOKMARK_TITLE);
-	fprintf(fp,gettext("\
+	fprintf(fp,"<title>%s</title>\n</head>\n", BOOKMARK_TITLE);
+	fprintf(fp, "%s<br>\n%s\n\n<!--\n%s\n-->\n\n<p>\n<ol>",
+		    gettext("\
      You can delete links using the remove bookmark command.  It is usually\n\
      the 'R' key but may have been remapped by you or your system\n\
-     administrator.<br>\n\
+     administrator."),
+		    gettext("\
      This file also may be edited with a standard text editor to delete\n\
-     outdated or invalid links, or to change their order.\n\n\
-<!--\n\
+     outdated or invalid links, or to change their order."),
+		    gettext("\
 Note: if you edit this file manually\n\
       you should not change the format within the lines\n\
       or add other HTML markup.\n\
-      Make sure any bookmark link saved as a single line\n\
--->\n\n\
-     <p>\n<ol>\n"));
+      Make sure any bookmark link is saved as a single line."));
     }
 
     /*
@@ -411,7 +411,7 @@
  */
 PUBLIC void remove_bookmark_link ARGS2(
 	int,		cur,
-	char *, 	cur_bookmark_page)
+	char *,		cur_bookmark_page)
 {
     FILE *fp, *nfp;
     char *buf = NULL;
@@ -867,7 +867,7 @@
  *  string will be handled properly. - FM
  */
 PUBLIC void LYMBM_statusline  ARGS1(
-	char *, 	text)
+	char *,		text)
 {
     if (LYMultiBookmarks == TRUE && user_mode == NOVICE_MODE) {
 	LYStatusLine = (LYlines - 1);
Index: src/LYCgi.c
--- 2.8.2dev.25/src/LYCgi.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYCgi.c	Wed May  5 18:33:59 1999
@@ -320,7 +320,7 @@
 	int fd1[2], fd2[2];
 	char buf[1024];
 	pid_t pid;
-#if HAVE_TYPE_UNIONWAIT
+#ifdef HAVE_TYPE_UNIONWAIT
 	union wait wstatus;
 #else
 	int wstatus;
Index: src/LYCharUtils.c
--- 2.8.2dev.25/src/LYCharUtils.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYCharUtils.c	Wed May  5 18:33:59 1999
@@ -844,7 +844,7 @@
 				      UCT_STAGE_STRUCTURED);
 }
 
-#if NOTUSED_FOTEMODS
+#ifdef NOTUSED_FOTEMODS
 /*
 **  This function reallocates an allocated string and converts
 **  characters for the current display character set.  It assumes
Index: src/LYCookie.c
--- 2.8.2dev.25/src/LYCookie.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYCookie.c	Wed May  5 18:33:59 1999
@@ -2474,22 +2474,25 @@
      *	Load HTML strings into buf and pass buf
      *	to the target for parsing and rendering. - FM
      */
+#define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
+
+
     HTSprintf0(&buf, "<HEAD>\n<TITLE>%s</title>\n</HEAD>\n<BODY>\n",
 		 COOKIE_JAR_TITLE);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
     HTSprintf0(&buf, "<h1>%s (%s)%s<a href=\"%s%s\">%s</a></h1>\n",
 	LYNX_NAME, LYNX_VERSION,
 	HELP_ON_SEGMENT,
 	helpfilepath, COOKIE_JAR_HELP, COOKIE_JAR_TITLE);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 
     HTSprintf0(&buf, "<NOTE>%s\n", ACTIVATE_TO_GOBBLE);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
     HTSprintf0(&buf, "%s</NOTE>\n", OR_CHANGE_ALLOW);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 
     HTSprintf0(&buf, "<DL COMPACT>\n");
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
     for (dl = domain_list; dl != NULL; dl = dl->next) {
 	de = dl->object;
 	if (de == NULL)
@@ -2503,7 +2506,7 @@
 	 */
 	HTSprintf0(&buf, "<DT>%s<DD><A HREF=\"LYNXCOOKIE://%s/\">Domain=%s</A>\n",
 		      de->domain, de->domain, de->domain);
-	(*target->isa->put_block)(target, buf, strlen(buf));
+	PUTS(buf);
 	switch (de->bv) {
 	    case (ACCEPT_ALWAYS):
 		HTSprintf0(&buf, COOKIES_ALWAYS_ALLOWED);
@@ -2520,9 +2523,9 @@
 #endif
 		break;
 	}
-	(*target->isa->put_block)(target, buf, strlen(buf));
+	PUTS(buf);
 	HTSprintf0(&buf, "\n");
-	(*target->isa->put_block)(target, buf, strlen(buf));
+	PUTS(buf);
 
 	/*
 	 *  Show the domain's cookies. - FM
@@ -2553,11 +2556,11 @@
 			 de->domain, co->lynxID, name, value);
 	    FREE(name);
 	    FREE(value);
-	    (*target->isa->put_block)(target, buf, strlen(buf));
+	    PUTS(buf);
 
 	    if (co->flags & COOKIE_FLAG_FROM_FILE) {
 		HTSprintf0(&buf, "%s\n", gettext("(from a previous session)"));
-		(*target->isa->put_block)(target, buf, strlen(buf));
+	        PUTS(buf);
 	    }
 
 	    /*
@@ -2574,14 +2577,14 @@
 			 ((co->flags & COOKIE_FLAG_SECURE) ? "YES" : "NO"),
 			 ((co->flags & COOKIE_FLAG_DISCARD) ? "YES" : "NO"));
 	    FREE(path);
-	    (*target->isa->put_block)(target, buf, strlen(buf));
+	    PUTS(buf);
 
 	    /*
 	     *	Show the list of acceptable ports, if present. - FM
 	     */
 	    if (co->PortList) {
 		HTSprintf0(&buf, "<DD>PortList=\"%s\"\n", co->PortList);
-		(*target->isa->put_block)(target, buf, strlen(buf));
+		PUTS(buf);
 	    }
 
 	    /*
@@ -2598,7 +2601,7 @@
 			Title);
 		FREE(Address);
 		FREE(Title);
-		(*target->isa->put_block)(target, buf, strlen(buf));
+		PUTS(buf);
 	    }
 
 	    /*
@@ -2609,7 +2612,7 @@
 		LYEntify(&comment, TRUE);
 		HTSprintf0(&buf, "<DD>Comment: %s\n", comment);
 		FREE(comment);
-		(*target->isa->put_block)(target, buf, strlen(buf));
+		PUTS(buf);
 	    }
 
 	    /*
@@ -2623,13 +2626,13 @@
 			 ((co->flags & COOKIE_FLAG_EXPIRES_SET)
 					    ?
 					 "" : "\n"));
-	    (*target->isa->put_block)(target, buf, strlen(buf));
+	    PUTS(buf);
 	}
 	HTSprintf0(&buf, "</DT>\n");
-	(*target->isa->put_block)(target, buf, strlen(buf));
+	PUTS(buf);
     }
     HTSprintf0(&buf, "</DL>\n</BODY>\n");
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 
     /*
      *	Free the target to complete loading of the
Index: src/LYDownload.c
--- 2.8.2dev.25/src/LYDownload.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYDownload.c	Wed May  5 18:33:59 1999
@@ -299,7 +299,7 @@
 	    if (HTCountCommandArgs(download_command->command) >= 2) {
 		_statusline(FILENAME_PROMPT);
 	again:	if (sug_file)
-		    strcpy(buffer, sug_file);
+		    strncpy(buffer, sug_file, sizeof(buffer));
 		else
 		    *buffer = '\0';
 	check_again:
Index: src/LYGetFile.c
--- 2.8.2dev.25/src/LYGetFile.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYGetFile.c	Wed May  5 18:33:59 1999
@@ -328,7 +328,6 @@
 		     */
 		    if ((historytarget(doc) == FALSE) ||
 			!doc || !doc->address) {
-			HTMLSetCharacterHandling(current_char_set);
 			return(NOT_FOUND);
 		    }
 
@@ -348,10 +347,8 @@
 #endif
 
 		    if (!HTLoadAbsolute(&WWWDoc)) {
-			HTMLSetCharacterHandling(current_char_set);
 			return(NOT_FOUND);
 		    }
-		    HTMLSetCharacterHandling(current_char_set);
 		    return(NORMAL);
 
 		} else if (url_type == LYNXEXEC_URL_TYPE ||
@@ -718,7 +715,6 @@
 				}
 				FREE(temp);
 			    }
-			    HTMLSetCharacterHandling(current_char_set);
 			    url_type = is_url(use_this_url_instead);
 			    if (url_type == LYNXDOWNLOAD_URL_TYPE ||
 				url_type == LYNXEXEC_URL_TYPE ||
@@ -827,7 +823,6 @@
 			     */
 			    goto Try_Redirected_URL;
 			}
-			HTMLSetCharacterHandling(current_char_set);
 			return(NOT_FOUND);
 		    }
 
@@ -857,7 +852,6 @@
 			    HTParentAnchor *tmpanchor;
 			    char *fname = NULL;
 
-			    HTMLSetCharacterHandling(current_char_set);
 			    /*
 			     *	Check for a suggested filename from
 			     *	the Content-Disposition header. - FM
@@ -922,7 +916,6 @@
 				    *  Also check the isHEAD element. - FM
 				    */
 				   doc->isHEAD != HTLoadedDocumentIsHEAD())) {
-			    HTMLSetCharacterHandling(current_char_set);
 			    /*
 			     *	Nothing needed to be shown.
 			     */
@@ -935,7 +928,6 @@
 			 */
 			    if (pound != NULL)
 				HTFindPoundSelector(pound+1);
-			    HTMLSetCharacterHandling(current_char_set);
 			    return(NORMAL);
 			}
 		    }
Index: src/LYHistory.c
--- 2.8.2dev.25/src/LYHistory.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYHistory.c	Wed May  5 18:33:59 1999
@@ -612,6 +612,20 @@
 #define STATUSBUFSIZE   40
 PRIVATE char * buffstack[STATUSBUFSIZE];
 PRIVATE int topOfStack = 0;
+#ifdef LY_FIND_LEAKS
+PRIVATE int already_registered_free_messages_stack = 0;
+#endif
+
+#ifdef LY_FIND_LEAKS
+PRIVATE void free_messages_stack NOARGS
+{
+    topOfStack = STATUSBUFSIZE;
+
+    while (--topOfStack >= 0) {
+	FREE(buffstack[topOfStack]);
+    }
+}
+#endif
 
 PRIVATE void to_stack ARGS1(char *, str)
 {
@@ -619,7 +633,7 @@
      *  Cycle buffer:
      */
     if (topOfStack == STATUSBUFSIZE) {
-        topOfStack = 0;
+	topOfStack = 0;
     }
 
     /*
@@ -628,18 +642,14 @@
     FREE(buffstack[topOfStack]);
     buffstack[topOfStack] = str;
     topOfStack++;
-}
-
 #ifdef LY_FIND_LEAKS
-PRIVATE void free_messages_stack NOARGS
-{
-    topOfStack = STATUSBUFSIZE;
-
-    while (--topOfStack >= 0) {
-	FREE(buffstack[topOfStack]);
+    if(!already_registered_free_messages_stack) {
+	already_registered_free_messages_stack = 1;
+	atexit(free_messages_stack);
     }
-}
 #endif
+}
+
 
 /*
  *  Status line messages list, LYNXMESSAGES:/ internal page,
Index: src/LYList.c
--- 2.8.2dev.25/src/LYList.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYList.c	Wed May  5 18:33:59 1999
@@ -53,6 +53,7 @@
     static char tempfile[LY_MAXPATH];
     FILE *fp0;
     char *Address = NULL, *Title = NULL, *cp = NULL;
+    char *LinkTitle = NULL;  /* Rel stored as property of link, not of dest */
     BOOLEAN intern_w_post = FALSE;
     char *desc = "unknown field or link";
 
@@ -82,7 +83,7 @@
 
 #ifdef EXP_ADDRLIST_PAGE
     if (titles != TRUE)
-        BeginInternalPage(fp0, ADDRLIST_PAGE_TITLE, LIST_PAGE_HELP);
+	BeginInternalPage(fp0, ADDRLIST_PAGE_TITLE, LIST_PAGE_HELP);
     else
 #endif
     BeginInternalPage(fp0, LIST_PAGE_TITLE, LIST_PAGE_HELP);
@@ -154,6 +155,16 @@
 	}
 	address =  HTAnchor_address(dest);
 	title = titles ? HTAnchor_title(parent) : NULL;
+	if (dest_intl) {
+	    HTSprintf0(&LinkTitle, "(internal)");
+	} else if (titles && child->mainLink.type &&
+		   dest == child->mainLink.dest &&
+		   !strncmp(HTAtom_name(child->mainLink.type),
+			    "RelTitle: ", 10)) {
+	    HTSprintf0(&LinkTitle, "(%s)", HTAtom_name(child->mainLink.type)+10);
+	} else {
+	    FREE(LinkTitle);
+	}
 	StrAllocCopy(Address, address);
 	FREE(address);
 	LYEntify(&Address, TRUE);
@@ -169,7 +180,7 @@
 
 	fprintf(fp0, "<li><a href=\"%s\"%s>%s%s%s%s%s</a>\n", Address,
 			dest_intl ? " TYPE=\"internal link\"" : "",
-			dest_intl ? "(internal) " : "",
+			LinkTitle ? LinkTitle : "",
 			((HTAnchor*)parent != dest) && Title ? "in " : "",
 			(char *)(Title ? Title : Address),
 			(Title && cp) ? " - " : "",
@@ -178,6 +189,7 @@
 	FREE(Address);
 	FREE(Title);
     }
+    FREE(LinkTitle);
 
     if (hidden_links > 0) {
 	if (refs > 0)
Index: src/LYLocal.c
--- 2.8.2dev.25/src/LYLocal.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYLocal.c	Wed May  5 18:33:59 1999
@@ -53,7 +53,7 @@
 #endif /* VMS */
 
 #ifndef WEXITSTATUS
-# if HAVE_TYPE_UNIONWAIT
+# ifdef HAVE_TYPE_UNIONWAIT
 #  define	WEXITSTATUS(status)	(status.w_retcode)
 # else
 #  define	WEXITSTATUS(status)	(((status) & 0xff00) >> 8)
@@ -61,7 +61,7 @@
 #endif
 
 #ifndef WTERMSIG
-# if HAVE_TYPE_UNIONWAIT
+# ifdef HAVE_TYPE_UNIONWAIT
 #  define	WTERMSIG(status)	(status.w_termsig)
 # else
 #  define	WTERMSIG(status)	((status) & 0x7f)
@@ -2033,7 +2033,7 @@
     int rc;
     char *tmpbuf = 0;
     pid_t pid;
-#if HAVE_TYPE_UNIONWAIT
+#ifdef HAVE_TYPE_UNIONWAIT
     union wait wstatus;
 #else
     int wstatus;
Index: src/LYMail.c
--- 2.8.2dev.25/src/LYMail.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYMail.c	Wed May  5 18:33:59 1999
@@ -37,8 +37,9 @@
      HTUnEscape(string);
      for (i=0; string[i] != '\0'; i++)
      {
-	/* FIXME: this is explicitly 7-bit ASCII */
-	if (string[i] < ' ' || string[i] >= 127)
+	/* FIXME: this is no longer explicitly 7-bit ASCII,
+	   but are there portability problems? */
+	if ((!LYIsASCII(string[i])) || !isprint(string[i]))
 	{
 	   string[i] = '?';
 	   flg = TRUE;
Index: src/LYMain.c
--- 2.8.2dev.25/src/LYMain.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYMain.c	Wed May  5 18:33:59 1999
@@ -44,7 +44,11 @@
 #endif /* !VMS */
 
 #ifdef LOCALE
+#undef gettext		/* Solaris locale.h prototypes gettext() */
 #include <locale.h>
+#ifndef HAVE_GETTEXT
+#define gettext(s) s
+#endif
 #endif /* LOCALE */
 
 #include <LYexit.h>
@@ -1843,9 +1847,9 @@
 
 #ifndef NO_CONFIG_INFO
 /*
- *  Some staff to reload lynx.cfg without restarting new lynx session,
+ *  Some stuff to reload lynx.cfg without restarting new lynx session,
  *  also load options menu items and command-line options
- *  to made things consistent.  Not implemented yet.
+ *  to make things consistent.  Not implemented yet.
  *  Warning: experimental, more main() reorganization required.
  *
  *  Called by user of interactive session by LYNXCFG://reload/ link.
@@ -2553,6 +2557,12 @@
 	  LYNX_RELEASE ? LYNX_RELEASE_DATE : &LYNX_DATE[LYNX_DATE_OFF]
 	  );
 #ifdef SYSTEM_NAME
+#ifndef __DATE__
+#define __DATE__ ""
+#endif
+#ifndef __TIME__
+#define __TIME__ ""
+#endif
     printf(gettext("Built on %s %s %s\n"), SYSTEM_NAME, __DATE__, __TIME__);
 #endif
     printf("\n");
Index: src/LYMainLoop.c
--- 2.8.2dev.25/src/LYMainLoop.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYMainLoop.c	Wed May  5 18:33:59 1999
@@ -961,7 +961,6 @@
 			newdoc.line = curdoc.line;
 			newdoc.link = curdoc.link;
 			newdoc.internal_link = FALSE; /* can't be true. - kw */
-			Newline = newdoc.line; /* now here, no partial mode */
 		    }
 
 		    /*
@@ -969,9 +968,22 @@
 		     *	line the user was on if s/he has been in the file
 		     *	before, or it is 1 if this is a new file.
 		     */
+#ifdef DISP_PARTIAL
 		    /* Newline = newdoc.line; */
 		    /* - alreary set and probably updated in partial mode */
-		    /*  End of incremental rendering stage here. */
+		    /* incremental rendering stage already closed (but see below) */
+
+		    if (Newline != Newline_partial || display_partial == TRUE) {
+		       /* This is the case when we came from the history stack
+			* _and_ cached HText was used instead of HT*Copy() call.
+			* Set Newline and close partial mode here.
+			*/
+		       Newline = Newline_partial;
+		       display_partial = FALSE;
+		    }
+#else
+		    Newline = newdoc.line; /* now here, no partial mode */
+#endif
 
 		    /*
 		     *	If we are going to a target line or
@@ -1052,6 +1064,8 @@
 	   psrc_view = FALSE;
 #endif
 
+	   HTMLSetCharacterHandling(current_char_set);	/* restore, for sure? */
+
 	   /*
 	    *  Reset all of the other relevant flags. - FM
 	    */
@@ -3616,6 +3630,16 @@
 	    }
 
 check_goto_URL:
+	    /* allow going to anchors*/
+	    if (*user_input_buffer == '#' ) {
+		if ( user_input_buffer[1] &&
+		     HTFindPoundSelector(user_input_buffer+1) ) {
+		     /* HTFindPoundSelector will initialize www_search_result,
+		        so we do nothing else. */
+		    HTAddGotoURL(user_input_buffer);
+		}
+		break;
+	    }
 	    /*
 	     *	If its not a URL then make it one.
 	     */
@@ -6012,7 +6036,9 @@
  *  put a message on the screen
  *  to tell the user other misc info.
  */
-PRIVATE void print_status_message(CONST linkstruct curlink, char **cp)
+PRIVATE void print_status_message ARGS2(
+	CONST linkstruct,	curlink,
+	char **,		cp)
 {
     /*
      *	Make sure form novice lines are replaced.
Index: src/LYMap.c
--- 2.8.2dev.25/src/LYMap.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYMap.c	Wed May  5 18:33:59 1999
@@ -537,12 +537,14 @@
 	LYEntify(&MapTitle, TRUE);
     }
 
+#define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
+
     HTSprintf0(&buf, "<html>\n<head>\n");
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
     HTSprintf0(&buf, "<META %s content=\"text/html;charset=%s\">\n",
 		"http-equiv=\"content-type\"",
 		LYCharSet_UC[current_char_set].MIMEname);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 	/*
 	 *  This page is a list of titles and anchors for them.
 	 *  Since titles already passed SGML/HTML stage
@@ -550,43 +552,43 @@
 	 *  That is why we insist on META charset for this page.
 	 */
     HTSprintf0(&buf, "<title>%s</title>\n", MapTitle);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
     HTSprintf0(&buf, "</head>\n<body>\n");
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 
     HTSprintf0(&buf,"<h1><em>%s</em></h1>\n", MapTitle);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 
     StrAllocCopy(MapAddress, address);
     LYEntify(&MapAddress, FALSE);
     HTSprintf0(&buf,"<h2><em>MAP:</em>&nbsp;%s</h2>\n", MapAddress);
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 
     HTSprintf0(&buf, "<%s compact>\n", ((keypad_mode == NUMBERS_AS_ARROWS) ?
 				    "ol" : "ul"));
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
     cur = theMap->elements;
     while (NULL != (new=(LYMapElement *)HTList_nextObject(cur))) {
 	StrAllocCopy(MapAddress, new->address);
 	LYEntify(&MapAddress, FALSE);
-	(*target->isa->put_block)(target, "<li><a href=\"", 13);
-	(*target->isa->put_block)(target, MapAddress, strlen(MapAddress));
+	PUTS("<li><a href=\"");
+	PUTS(MapAddress);
+	PUTS("\"");
 #ifndef DONT_TRACK_INTERNAL_LINKS
 	if (new->intern_flag)
-	    (*target->isa->put_block)(target, "\" TYPE=\"internal link\"\n>",24);
-	else
+	    PUTS(" TYPE=\"internal link\"");
 #endif
-	    (*target->isa->put_block)(target, "\"\n>", 3);
+	PUTS("\n>");
 	StrAllocCopy(MapTitle, new->title);
 	LYEntify(&MapTitle, TRUE);
-	(*target->isa->put_block)(target, MapTitle, strlen(MapTitle));
-	(*target->isa->put_block)(target, "</a>\n", 5);
+	PUTS(MapTitle);
+	PUTS("</a>\n");
     }
     HTSprintf0(&buf, "</%s>\n</body>\n</html>\n",
 		    ((keypad_mode == NUMBERS_AS_ARROWS)
 		    ? "ol"
 		    : "ul"));
-    (*target->isa->put_block)(target, buf, strlen(buf));
+    PUTS(buf);
 
     (*target->isa->_free)(target);
     FREE(MapAddress);
Index: src/LYOptions.c
--- 2.8.2dev.25/src/LYOptions.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYOptions.c	Wed May  5 18:33:59 1999
@@ -28,6 +28,10 @@
 
 PRIVATE void terminate_options	PARAMS((int sig));
 
+#if !defined(NO_OPTION_MENU) || defined(NCURSES_MOUSE_VERSION)
+#define COL_OPTION_VALUES 36  /* display column where option values start */
+#endif
+
 #ifndef NO_OPTION_MENU
 PRIVATE int boolean_choice PARAMS((
 	int		status,
@@ -98,9 +102,6 @@
 #define B_VERBOSE_IMAGES 50
 #define C_VERBOSE_IMAGES (B_VERBOSE_IMAGES + 21)
 
-
-#define COL_OPTION_VALUES 36  /* display column where option values start */
-
 /* a kludge to add assume_charset only in ADVANCED mode... */
 #define L_Bool_A (use_assume_charset ? L_BOOL_A + 1 : L_BOOL_A)
 #define L_Bool_B (use_assume_charset ? L_BOOL_B + 1 : L_BOOL_B)
@@ -2164,7 +2165,7 @@
     signal(SIGINT, cleanup_sig);
 }
 
-#ifndef NO_OPTION_MENU
+#if !defined(NO_OPTION_MENU) || defined(NCURSES_MOUSE_VERSION)
 /*
 **  This function prompts for a choice or page number.
 **  If a 'g' or 'p' suffix is included, that will be
@@ -3962,7 +3963,7 @@
     if (!HTLoadAbsolute(&WWWDoc))
        return(NOT_FOUND);
 
-    reloading = FALSE;  /* set manually */ 
+    reloading = FALSE;  /* set manually */
     /*  force end-to-end reload from remote server if change LYUserAgent
      *  or language or pref_charset (marked by need_end_reload flag above),
      *  from old-style LYK_OPTIONS (mainloop):
Index: src/LYPrettySrc.c
--- 2.8.2dev.25/src/LYPrettySrc.c	Tue Apr 13 03:39:16 1999
+++ 2.8.2dev.26/src/LYPrettySrc.c	Wed May  5 18:33:59 1999
@@ -7,12 +7,12 @@
 #include <LYPrettySrc.h>
 
 #ifdef USE_PSRC
-
+BOOL psrc_convert_string = FALSE;
 PUBLIC BOOL psrc_view = FALSE;/* this is read by SGML_put_character - TRUE
 	when viewing pretty source */
 PUBLIC BOOL LYpsrc = FALSE; /* this tells what will be shown on '\':
   if TRUE, then pretty source, normal source view otherwise. Toggled by
-  -pretty_source commandline option.  */
+  -prettysrc commandline option.  */
 PUBLIC BOOL sgml_in_psrc_was_initialized;
 PUBLIC BOOL psrc_nested_call;
 PUBLIC BOOL psrc_first_tag;
Index: src/LYPrettySrc.h
--- 2.8.2dev.25/src/LYPrettySrc.h	Tue Apr 13 03:39:16 1999
+++ 2.8.2dev.26/src/LYPrettySrc.h	Wed May  5 18:33:59 1999
@@ -5,6 +5,9 @@
 
 #include <HTMLDTD.h>
 
+extern BOOL psrc_convert_string;
+ /*whether HTML_put_string should convert string passed with 
+   TRANSLATE_AND_UNESCAPE_TO_STD */
 extern BOOL psrc_view;
 extern BOOL LYpsrc;
 extern BOOL sgml_in_psrc_was_initialized; 
Index: src/LYReadCFG.c
--- 2.8.2dev.25/src/LYReadCFG.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYReadCFG.c	Wed May  5 18:33:59 1999
@@ -1177,7 +1177,7 @@
      PARSE_ENV("wais_proxy", CONF_ENV, 0 ),
      PARSE_STR("xloadimage_command", CONF_STR, &XLoadImageCommand),
 
-     {0}
+     {0, 0, 0}
 };
 
 /*
@@ -1196,6 +1196,21 @@
 	switch (tbl->type) {
 	case CONF_ENV:
 	    if (q->str_value != 0) {
+		char *name = *(q->str_value);
+		char *eqls = strchr(name, '=');
+		if (eqls != 0) {
+		    *eqls = 0;
+#ifdef VMS
+		    Define_VMSLogical(name, NULL);
+#else
+# ifdef HAVE_UNSETENV
+		    unsetenv(name);
+# else
+		    if (putenv(name))
+		    	break;
+# endif
+#endif
+		}
 		FREE(*(q->str_value));
 		FREE(q->str_value);
 		/* is it enough for reload_read_cfg() to clean up
@@ -1421,9 +1436,16 @@
 
 	    char *url = NULL;
 	    char *cp1 = NULL;
+	    char *sep = NULL;
 
-	    if ((p1 = strchr(value,':')) != 0)
-		*p1++ ='\0';
+	    if ( (p1 = strstr(value, sep=" for ")) != 0
+#if defined(UNIX) && !defined(__EMX__)
+		|| (p1 = strstr(value, sep=":")) != 0
+#endif
+	    ) {
+		*p1 = '\0';
+		p1 += strlen(sep);
+	    }
 
 #ifndef NO_CONFIG_INFO
 	    if (fp0 != 0  &&  !LYRestricted) {
@@ -1434,7 +1456,7 @@
 		}
 
 		fprintf(fp0, "%s:<a href=\"%s\">%s</a>\n\n", name, url, cp1);
-		fprintf(fp0, "	  #&lt;begin  %s&gt;\n", cp1);
+		fprintf(fp0, "    #&lt;begin  %s&gt;\n", cp1);
 	    }
 #endif
 
@@ -1460,7 +1482,10 @@
 			}
 			cur_set[tbl2 - Config_Table] = FALSE;
 		    }
-		    *p2 = savechar;
+		    if (savechar && p2[1])
+			p1 = p2 + 1;
+		    else
+			break;
 		}
 	    }
 	    if (!allowed) {
@@ -1487,13 +1512,13 @@
 		char *buf = NULL;
 		unsigned i;
 
-		fprintf(fp0,"	  Options allowed in this file:\n");
+		fprintf(fp0,"     Options allowed in this file:\n");
 		for (i = 0; i < NOPTS_; ++i) {
 		    if ((*resultant_set)[i])
 			continue;
 		    StrAllocCopy(buf, Config_Table[i].name);
 		    LYUpperCase(buf);
-		    fprintf(fp0,"	  * %s\n", buf);
+		    fprintf(fp0,"         * %s\n", buf);
 		}
 		free(buf);
 	    }
@@ -1502,7 +1527,7 @@
 
 #ifndef NO_CONFIG_INFO
 	    if (fp0 != 0  &&  !LYRestricted) {
-		fprintf(fp0, "	  #&lt;end of %s&gt;\n\n", cp1);
+		fprintf(fp0, "    #&lt;end of %s&gt;\n\n", cp1);
 		FREE(url);
 		FREE(cp1);
 	    }
Index: src/LYStrings.c
--- 2.8.2dev.25/src/LYStrings.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYStrings.c	Wed May  5 18:33:59 1999
@@ -998,7 +998,7 @@
 #ifdef NCURSES_MOUSE_VERSION
 PRIVATE int LYmouse_menu ARGS3(int, x, int, y, int, atlink)
 {
-    char *choices[] = {
+    static char *choices[] = {
 	"Quit",
 	"Home page",
 	"Previous document",
@@ -1024,7 +1024,7 @@
 	"Set Options",
 	NULL
     };
-    char *choices_link[] = {
+    static char *choices_link[] = {
 	"Help",
 	"Do nothing",
 	"Activate this link",
@@ -1032,7 +1032,7 @@
 	"Download",
 	NULL
     };
-    int actions[] = {
+    static int actions[] = {
 	LYK_ABORT,
 	LYK_MAIN_MENU,
 	LYK_PREV_DOC,
@@ -1057,7 +1057,7 @@
 	LYK_INDEX_SEARCH,
 	LYK_OPTIONS
     };
-    int actions_link[] = {
+    static int actions_link[] = {
 	LYK_HELP,
 	LYK_REFRESH,
 	LYK_ACTIVATE,
Index: src/LYStyle.c
Prereq:  1.26 
--- 2.8.2dev.25/src/LYStyle.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYStyle.c	Wed May  5 18:33:59 1999
@@ -1,6 +1,6 @@
 /* character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * $Id: LYStyle.c 1.26 Tue, 27 Apr 1999 06:59:06 -0600 dickey $
+ * $Id: LYStyle.c 1.27 Wed, 05 May 1999 18:33:59 -0600 dickey $
  */
 #include <HTUtils.h>
 #include <HTML.h>
@@ -466,8 +466,8 @@
 	   (styleclassname ? styleclassname : "<null>"), tmp);
 }
 
-/* This function is desgined as faster analog to TrimColorClass.
-   It assumes that tag_name is presentin stylename! -HV
+/* This function is designed as faster analog to TrimColorClass.
+   It assumes that tag_name is present in stylename! -HV
 */
 PUBLIC void FastTrimColorClass ARGS5 (
 	    CONST char*,	 tag_name,
@@ -482,7 +482,7 @@
     {
 	for (; tag_start >= stylename &&  *tag_start!=';' ; --tag_start)
 	    ;
-	if ( !strncasecmp(tag_start+1, tag_name, name_len) ) break;
+	if ( !strncasecomp(tag_start+1, tag_name, name_len) ) break;
 	    --tag_start;
     }
     *tag_start = '\0';
Index: src/LYUtils.c
--- 2.8.2dev.25/src/LYUtils.c	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYUtils.c	Wed May  5 18:33:59 1999
@@ -45,7 +45,7 @@
 #endif /* UTMPX_FOR_UTMP */
 #endif /* HAVE_UTMP */
 
-#if NEED_PTEM_H
+#ifdef NEED_PTEM_H
 /* they neglected to define struct winsize in termios.h -- it's only in
  * termio.h and ptem.h (the former conflicts with other definitions).
  */
@@ -4931,7 +4931,7 @@
     int n;
     for (leaf = 0, n = strlen(pathname)-1; n >= 0; n--) {
 	if (strchr("\\/:", pathname[n]) != 0) {
-	    leaf = pathname + n;
+	    leaf = pathname + n + 1;
 	    break;
 	}
     }
Index: src/LYUtils.h
--- 2.8.2dev.25/src/LYUtils.h	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/LYUtils.h	Wed May  5 18:33:59 1999
@@ -190,7 +190,7 @@
     LYNXCOMPILE_OPTS_URL_TYPE,
     LYNXMESSAGES_URL_TYPE,
 
-    PROXY_URL_TYPE,
+    PROXY_URL_TYPE
 
 } UrlTypes;
 
Index: src/LYrcFile.c
--- 2.8.2dev.25/src/LYrcFile.c	Tue Apr 27 06:59:06 1999
+++ 2.8.2dev.26/src/LYrcFile.c	Wed May  5 18:33:59 1999
@@ -1012,7 +1012,7 @@
      *  Local execution mode - only links in local files.
      */
     write_list(fp, gettext("\
-If run_execution_links_on_local_files is set \"on\" then all local\n
+If run_execution_links_on_local_files is set \"on\" then all local\n\
 execution links that are found in LOCAL files will be executed when they\n\
 are selected.  This is different from run_all_execution_links in that\n\
 only files that reside on the local system will have execution link\n\
Index: src/makefile.in
--- 2.8.2dev.25/src/makefile.in	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/src/makefile.in	Wed May  5 18:33:59 1999
@@ -44,10 +44,9 @@
 		-Ichrtrans \
 		-I$(srcdir)/chrtrans \
 		-I$(top_srcdir) \
-		-I$(top_srcdir)/intl \
 		-I$(top_srcdir)/src \
 		-I$(top_srcdir)/$(WWWINC) \
-		$(SITE_DEFS)
+		@INTLDIR_CPPFLAGS@ $(SITE_DEFS)
 CC_OPTS		= $(CPP_OPTS) $(CFLAGS)
 
 LINT		= @LINT@
Index: test/sgml.html
--- 2.8.2dev.25/test/sgml.html	Wed Mar 17 20:17:11 1999
+++ 2.8.2dev.26/test/sgml.html	Wed May  5 18:33:59 1999
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-<TITLE> Test of some Unicode symbols enclosed as SGML entity names </TITLE>
+<TITLE>Test of some Unicode symbols enclosed as SGML entity names</TITLE>
 </HEAD>
 <BODY>
 <PRE>
@@ -13,7 +13,8 @@
 
 original comment:
 
-# Author: John Cowan <cowan@ccil.org>
+<pre>
+# Author: John Cowan &lt;cowan@ccil.org&gt;
 # Date: 25 July 1997
 #
 # The following table maps SGML character entities from various
@@ -38,6 +39,7 @@
 # The contents of this table are drawn from various sources, and
 # are in the public domain.
 #
+</pre>
 <!-- Changes:
 +   {"euro",    0x20AC},  /* EURO SIGN                                     */
     {"loz",     0x25CA},  /* LOZENGE                                       */
Index: test/unicode.html
--- 2.8.2dev.25/test/unicode.html	Wed Mar 17 20:17:11 1999
+++ 2.8.2dev.26/test/unicode.html	Wed May  5 18:33:59 1999
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-<TITLE> Test of some Unicode symbols in numeric character reference form </TITLE>
+<TITLE>Test of some Unicode symbols in numeric character reference form</TITLE>
 </HEAD>
 <BODY>
 <PRE>
@@ -13,7 +13,8 @@
 
 original comment:
 
-# Author: John Cowan <cowan@ccil.org>
+<pre>
+# Author: John Cowan &lt;cowan@ccil.org&gt;
 # Date: 25 July 1997
 #
 # The following table maps SGML character entities from various
@@ -38,6 +39,7 @@
 # The contents of this table are drawn from various sources, and
 # are in the public domain.
 #
+</pre>
 <!-- Changes:
 +   {"euro",    0x20AC},  /* EURO SIGN                                     */
 
Index: userdefs.h
--- 2.8.2dev.25/userdefs.h	Fri Apr 23 08:56:35 1999
+++ 2.8.2dev.26/userdefs.h	Wed May  5 18:33:59 1999
@@ -7,7 +7,12 @@
 
 /*******************************************************************
  * There are four sections to this document:
- *  Section 1.  Things you MUST change or verify
+ *  Section 1.  Things you MUST verify.  Unix platforms use a configure
+ *		script to provide sensible default values.  If your site
+ *		has special requirements, that may not be sufficient. 
+ *		For non-Unix platforms (e.g., VMS), there is no
+ *		configure script, so the defaults here are more
+ *		critical.
  *	Section 1a)  VMS specific things
  *	Section 1b)  non-VMS specific things
  *	Section 1c)  ALL Platforms
@@ -416,13 +421,27 @@
  */
 
 /*****************************
- * STARTFILE is the default file if none is specified in lynx.cfg,
- *  on the command line, or via a WWW_HOME environment variable.
+ * STARTFILE is the default starting URL if none is specified
+ *   on the command line or via a WWW_HOME environment variable;
+ *   Lynx will refuse to start without a starting URL of some kind.
+ * STARTFILE can be remote, e.g. http://www.w3.org/default.html ,
+ *                or local, e.g. file://localhost/PATH_TO/FILENAME ,
+ *           where PATH_TO is replaced with the complete path to FILENAME
+ *           using Unix shell syntax and including the device on VMS.
  *
- * note: STARTFILE must be a URL.  See the Lynx online help for more
- *       information on URLs
+ * Normally we expect you will connect to a remote site, e.g., the Lynx starting
+ * site:
  */
 #define STARTFILE "http://lynx.browser.org/"
+/*
+ * As an alternative, you may want to use a local URL.  A good choice for this
+ * is the user's home directory: 
+ *#define STARTFILE "file://localhost/~/"
+ *
+ * Your choice of STARTFILE should reflect your site's needs, and be a URL that
+ * you can connect to reliably.  Otherwise users will become confused and think
+ * that they cannot run Lynx.
+ */
 
 /*****************************
  * HELPFILE must be defined as a URL and must have a
@@ -1225,12 +1244,12 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.2dev.25"
+#define LYNX_VERSION "2.8.2dev.26"
 #define LYNX_WWW_HOME "http://lynx.browser.org/"
 #define LYNX_WWW_DIST "http://www.slcc.edu/lynx/current/"
 #define LYNX_RELEASE FALSE
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 27 Apr 1999 06:59:06 -0600"
+#define LYNX_DATE "Wed, 05 May 1999 18:33:59 -0600"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 #define LYNX_RELEASE_DATE "1998"