snapshot of project "lynx", label v2-8-5dev_16

author: Thomas E. Dickey <dickey@invisible-island.net> 2003-06-02 01:32:28 -0400
committer: Thomas E. Dickey <dickey@invisible-island.net> 2003-06-02 01:32:28 -0400
commit: 6bbc5d0bfc53e1fbe69f916504c008e1b74b0b19 (patch)
tree: feebae850ee453021e05860f09ee7f7f4eac7651
parent: 03413d1c868839950b21fd0b10fa5f31fff83964 (diff)
download: lynx-snapshots-6bbc5d0bfc53e1fbe69f916504c008e1b74b0b19.tar.gz
52 files changed, 7342 insertions, 1551 deletions
diff --git a/CHANGES b/CHANGES
index a39b384c..a64ba03f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,116 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2003-06-01 (2.8.5dev.16)
++ add zh_CN.po from
+  http://www.iro.umontreal.ca/contrib/po/maint/lynx/
++ updated obsolete link for nntp in users's guide -TD
++ add F_FILE_TYPE to F_TEXTLIKE() macro, and use it consistently in a few more
+  places, making editing in filename fields consistent with other text input
+  fields -TD
++ add LYAdjHiTextPos() to modify the behavior of color-style code, so leading
+  blanks are not highlighted (reported by Frederic L W Meunier) -TD
++ modify CacheThru_new() to accept "https:" URLs for source-caching (report
+  by Chuck Martin) -TD
++ adapt some of the SH_EX ifdef'd features:
+  + add -delay option, to make progress messages slow, along with corresponding
+    code for lynx.cfg -TD
+  + show build date/time for systems that do not use a configure script.
+  + use LYK_CHG_CENTER keycode bound to ^Q to control whether table cells are
+    centered.  The command-line -center option also controls this behavior.
++ add BIN_SUFFIX, TEXT_SUFFIX to userdefs.h -TD
++ modify BeginInternalPage(), adding a doctype to generated internal pages
+  to allow validating them -TD
++ modify HTFWriter.c to use binary suffix for any file with an application
+  presentation type, to better distinguish it from text and html.  Use text
+  suffix for any "text/" file other than "text/html".  These changes cover the
+  most common cases needed to make a link to view the temporary file useful in
+  the download page -TD
++ modify LYdownload_options(), adding a link to view the temporary file if the
+  downloaded file is text or html -TD
++ modify LYwouldPush(), omitting the download page from list of user-interface
+  pages which should not be pushed onto the history stack when visiting another
+  page, such as info or help.  Otherwise the downloaded file is discarded
+  (report by BL) -TD
++ simplify set_vi_keys() and related functions using table-driven
+  set_any_keys() and reset_any_keys() -TD
++ HTAnchor_findAddress now returns HTParentAnchor, avoid casting -LP
++ change select timeout in HTCheckForInterrupt() to zero, allowing immediate
+  return rather than waiting (DJGPP otherwise blocks for 50msec).  For Unix
+  platforms, the DontCheck() function limits the amount of polling which
+  otherwise would be too much CPU usage -LP
++ modify configure check for gcc -Winline warning to work around defect in
+  gcc 3.3 -TD
++ fix bug introduced recently in forms-submitting for TEXTAREA; the "%0d%0a"
+  was put after each line rather than before, making the first and second lines
+  joined (report by LV) -TD
++ reset the leading/trailing space counts in error-recovery logic added in
+  2.8.5dev.15 for S_litteral case in SGML_character().  Otherwise a mismatch,
+  e.g., due to a stray "<" or ">" in <script>...</script>, prevented a match
+  on the </script> -TD
++ do not free adult_table[] atexit - it should be perfectly empty after
+  free'ing all HText's.  (There is an error if it is not empty at exit) -LP
++ unnamed child anchors (`children_notag' list) now use HText memory pool.
+  Links properly deleted when reparsing the document -LP
++ Use less memory for documents with many anchors:  most anchors are never
+  visited, just stored for the reference.  So fill in adult_table[] with
+  HTParentAnchor0 (36 bytes size) instead of full HTParentAnchor (~200 bytes). 
+  HTParentAnchor now allocated on demand, nearly 1:1 to HText.  [more comments
+  in HTAnchor.h, changes located in HTAnchor.c] -LP
++ HTParentAnchor0 stores its hash value, to avoid calling HASH_FUNCTION twice
+  on the same anchor (Re:  HTAnchor_delete()) -LP
++ fix a potential out-of-bounds bug in HTBEquivalent() -LP
++ change strrchr() calls to strchr() in a few src/*.c file when parsing
+  "#fragment" left-to-right -LP
++ modify HTFWriter_abort() to remove file on error -IZ
++ added hot.paste style which puts a right-arrow at the UR corner (which is
+  currently unused).  Clicking on it initiates a GOTO to the current selection
+  (same as PASTE_URL action).  The hot.paste style is disabled unless STYLES
+  and CUT_AND_PASTE are both enabled.  Disabled and the user defines hot.paste
+  in the ".lss" file -IZ
++ modify LYK_PASTE_URL case in LYMainLoop.c to allow pasting URLs of the form
+  <address> and "<URL:address>" to lynx.  This is useful when it is not easy to
+  choose address without the surrounding "<>" or "<URL:>" -IZ
++ make a minor memory saving (circa 15%) for table processing, improve yet
+  another case of "ladder" (as in the top of google results), and fixes one
+  case of "wrong indentation" (elements of a table which contained <center>
+  were made too wide) -IZ
++ modify Stbl_trimFakeRows() to compensate for 2.8.5dev.15 changes to
+  Stbl_addRowToTable() from 2.8.5dev.15 which caches shrinking cell arrays in a
+  pool.  It did not take into account reallocation of the same data, e.g., in
+  Stbl_reserveCellsInRow().  For example:
+    http://camden-sbc.rutgers.edu/FacultyStaff/Directory/default.htm
+  (report by Patrick Ash) -IZ
++ add FORCE_COOKIE_PROMPT setting to lynx.cfg, allowing for manipulation in the
+  options menu and (if LYNXRC_ENABLE is set) via the .lynxrc file.  This lets
+  the user decide whether to ignore prompting for cookies with invalid syntax.
+  If the prompts are ignored, a corresponding message is displayed -TD
++ add FORCE_SSL_PROMPT setting to lynx.cfg, allowing for manipulation in the
+  options menu and (if LYNXRC_ENABLE is set) via the .lynxrc file.  This lets
+  the user decide whether to ignore prompting for questionable aspects of
+  an SSL connection.  If the prompts are ignored, a corresponding message is
+  displayed -TD
++ change select() calls to use the expected 1+descriptor value documented for
+  that function rather than FD_SETSIZE.  It is possible that some very old
+  or unique platform would not work, but this is more efficient (discussion on
+  lynx-dev) -TD
++ modify logic for S_litteral case in SGML_character() to recover from spaces
+  between the '<', '>' and the corresponding end of the tag, e.g.,
+	<style >
+	< style >
+	< style >
+  match "<style>", and
+	</style >
+	< /style >
+	< /style >
+  match "</style>" (report by TH) -TD
++ correct a check in HText_trimHightext() for the last line of the display,
+  which left unhighlighted the portion of a multi-line anchor which fell in
+  that place (report by TH) -TD
++ correct an off-by-one in redraw_lines_of_link() which left the link on the
+  last line on a page highlighted when moving the cursor up (reported by Morten
+  Bo Johansen) -TD
+
 2003-04-27 (2.8.5dev.15)
 * change definition of docdir1, helpdir1 to avoid using ksh-semantics (see
   2.8.5dev.2) -TD
@@ -90,7 +200,7 @@ Changes since Lynx 2.8 release
   in the adults table (more correct in case of post data), now a mainline:
   we omit "#ifndef DONT_TRACK_INTERNAL_LINKS" condition in the two files.
   In HTML.c, avoid using internal links for unrelated `src=' attributes
-  (BGSOUND_SRC, FRAME_SRC, IFRAME_SRC, OVERLAY_SRC, EMBED_ERC links:) -LP
+  (BGSOUND_SRC, FRAME_SRC, IFRAME_SRC, OVERLAY_SRC, EMBED_SRC links:) -LP
 * refine HTAnchor_delete() vs deleteLinks() mutual recursion logic - LP
 * change ALIGN_SIZE in GridText.c to sizeof(double), which is probably more
   portable than "8" -LP
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index c623218e..1ea1d7fd 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -684,10 +684,10 @@ PRIVATE int HTLoad ARGS4(
     /* prevent crash if telnet or similar mapped or proxied by rule. - kw */
     LYFixCursesOnForAccess(addr, HTAnchor_physical(anchor));
     p = (HTProtocol *)HTAnchor_protocol(anchor);
-    anchor->underway = TRUE;		/* Hack to deal with caching */
+    anchor->parent->underway = TRUE;		/* Hack to deal with caching */
     status= p->load(HTAnchor_physical(anchor),
 			anchor, format_out, sink);
-    anchor->underway = FALSE;
+    anchor->parent->underway = FALSE;
     LYUCPopAssumed();
     return status;
 }
@@ -817,7 +817,7 @@ PRIVATE BOOL HTLoadDocument ARGS4(
 	    NewDoc.bookmark = anchor->bookmark;
 	    NewDoc.isHEAD = anchor->isHEAD;
 	    NewDoc.safe = anchor->safe;
-	    anchor = HTAnchor_parent(HTAnchor_findAddress(&NewDoc));
+	    anchor = HTAnchor_findAddress(&NewDoc);
 	}
     }
     /*
@@ -1083,7 +1083,7 @@ PUBLIC BOOL HTLoadAbsolute ARGS1(
 	CONST DocAddress *,	docaddr)
 {
     return HTLoadDocument(docaddr->address,
-			  HTAnchor_parent(HTAnchor_findAddress(docaddr)),
+			  HTAnchor_findAddress(docaddr),
 			  (HTOutputFormat ? HTOutputFormat : WWW_PRESENT),
 			  HTOutputStream);
 }
@@ -1106,7 +1106,7 @@ PUBLIC BOOL HTLoadToStream ARGS3(
 	HTStream *,	sink)
 {
     return HTLoadDocument(addr,
-			  HTAnchor_parent(HTAnchor_findAddress(addr)),
+			  HTAnchor_findAddress(addr),
 			  (HTOutputFormat ? HTOutputFormat : WWW_PRESENT),
 			  sink);
 }
@@ -1131,7 +1131,6 @@ PUBLIC BOOL HTLoadRelative ARGS2(
     BOOL result;
     char * mycopy = NULL;
     char * stripped = NULL;
-    char * current_address = HTAnchor_address((HTAnchor*)here);
 
     full_address.address = NULL;
     full_address.post_data = NULL;
@@ -1145,7 +1144,7 @@ PUBLIC BOOL HTLoadRelative ARGS2(
     stripped = HTStrip(mycopy);
     full_address.address =
 		HTParse(stripped,
-			current_address,
+			here->address,
 			PARSE_ACCESS|PARSE_HOST|PARSE_PATH|PARSE_PUNCTUATION);
     result = HTLoadAbsolute(&full_address);
     /*
@@ -1154,7 +1153,6 @@ PUBLIC BOOL HTLoadRelative ARGS2(
     **	is appropriate. - FM
     */
     FREE(full_address.address);
-    FREE(current_address);
     FREE(mycopy);  /* Memory leak fixed 10/7/92 -- JFG */
     return result;
 }
@@ -1182,14 +1180,12 @@ PUBLIC BOOL HTLoadAnchor ARGS1(
     if (HTAnchor_document(parent) == NULL) {	/* If not already loaded */
 						/* TBL 921202 */
 	BOOL result;
-	char * address = HTAnchor_address((HTAnchor*) parent);
 
-	result = HTLoadDocument(address,
+	result = HTLoadDocument(parent->address,
 				parent,
 				HTOutputFormat ?
 				HTOutputFormat : WWW_PRESENT,
 				HTOutputStream);
-	FREE(address);
 	if (!result) return NO;
 	loaded = YES;
     }
@@ -1197,7 +1193,9 @@ PUBLIC BOOL HTLoadAnchor ARGS1(
     {
 	HText *text = (HText*)HTAnchor_document(parent);
 
-	if (destination != (HTAnchor *)parent) {  /* If child anchor */
+	if ((destination != (HTAnchor *)parent) &&
+	    (destination != (HTAnchor *)(parent->parent))) {
+						  /* If child anchor */
 	    HText_selectAnchor(text,		  /* Double display? @@ */
 			       (HTChildAnchor*)destination);
 	} else {
@@ -1321,7 +1319,7 @@ PUBLIC BOOL HTSearchAbsolute ARGS2(
     abs_doc.isHEAD = FALSE;
     abs_doc.safe = FALSE;
 
-    anchor = (HTParentAnchor*)HTAnchor_findAddress(&abs_doc);
+    anchor = HTAnchor_findAddress(&abs_doc);
     return HTSearch(keywords, anchor);
 }
 
@@ -1396,13 +1394,13 @@ PUBLIC HTParentAnchor * HTHomeAnchor NOARGS
 		   my_home_document : (HTClientHost ?
 				     REMOTE_ADDRESS : LAST_RESORT)),
 		  STR_FILE_URL,
-		  PARSE_ACCESS|PARSE_HOST|PARSE_PATH|PARSE_PUNCTUATION);
+		  PARSE_ALL_WITHOUT_ANCHOR);
     if (my_home_document) {
 	CTRACE((tfp, "HTAccess: Using custom home page %s i.e., address %s\n",
 		    my_home_document, ref));
 	FREE(my_home_document);
     }
-    anchor = (HTParentAnchor*)HTAnchor_findAddress(ref);
+    anchor = HTAnchor_findSimpleAddress(ref);
     FREE(ref);
     return anchor;
 }
diff --git a/WWW/Library/Implementation/HTAccess.h b/WWW/Library/Implementation/HTAccess.h
index be78361d..8d6e40e1 100644
--- a/WWW/Library/Implementation/HTAccess.h
+++ b/WWW/Library/Implementation/HTAccess.h
@@ -105,15 +105,11 @@ extern BOOL override_proxy PARAMS((
 Load a document from relative name
 
   ON ENTRY,
-
   relative_name           The relative address of the file to be accessed.
-
   here                    The anchor of the object being searched
 
   ON EXIT,
-
   returns    YES          Success in opening file
-
   NO                      Failure
 
  */
@@ -127,23 +123,11 @@ extern  BOOL HTLoadRelative PARAMS((
 Load a document from absolute name
 
   ON ENTRY,
-
   addr                    The absolute address of the document to be accessed.
-
   filter_it               if YES, treat document as HTML
 
- */
-
-/*
-
   ON EXIT,
-
- */
-
-/*
-
   returns YES             Success in opening document
-
   NO                      Failure
 
  */
@@ -155,15 +139,11 @@ extern BOOL HTLoadAbsolute PARAMS((CONST DocAddress * addr));
 Load a document from absolute name to a stream
 
   ON ENTRY,
-
   addr                    The absolute address of the document to be accessed.
-
   filter_it               if YES, treat document as HTML
 
   ON EXIT,
-
   returns YES             Success in opening document
-
   NO                      Failure
 
    Note: This is equivalent to HTLoadDocument
@@ -178,27 +158,13 @@ extern BOOL HTLoadToStream PARAMS((CONST char * addr, BOOL filter_it,
 Load if necessary, and select an anchor
 
   ON ENTRY,
-
   destination                The child or parenet anchor to be loaded.
 
- */
-
-/*
-
   ON EXIT,
-
- */
-
-/*
-
   returns YES             Success
-
   returns NO              Failure
 
  */
-
-
-
 extern BOOL HTLoadAnchor PARAMS((HTAnchor * destination));
 
 
@@ -207,16 +173,12 @@ extern BOOL HTLoadAnchor PARAMS((HTAnchor * destination));
 Make a stream for Saving object back
 
   ON ENTRY,
-
   anchor                  is valid anchor which has previously beeing loaded
 
   ON EXIT,
-
   returns                 0 if error else a stream to save the object to.
 
  */
-
-
 extern HTStream * HTSaveStream PARAMS((HTParentAnchor * anchor));
 
 
@@ -228,9 +190,7 @@ Search
    current address and attempts to open the new address.
 
   ON ENTRY,
-
   *keywords               space-separated keyword list or similar search list
-
   here                    The anchor of the object being searched
 
  */
@@ -245,9 +205,7 @@ Search Given Indexname
    the current address and attempts to open the new address.
 
   ON ENTRY,
-
   *keywords               space-separated keyword list or similar search list
-
   *indexname              is name of object search is to be done on.
 
  */
diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c
index 57288037..e463c408 100644
--- a/WWW/Library/Implementation/HTAnchor.c
+++ b/WWW/Library/Implementation/HTAnchor.c
@@ -22,6 +22,7 @@
 #include <UCAux.h>
 #include <UCMap.h>
 
+#include <GridText.h>
 #include <LYUtils.h>
 #include <LYCharSets.h>
 #include <LYLeaks.h>
@@ -68,14 +69,32 @@ PRIVATE HTList adult_table[HASH_SIZE] = { {NULL, NULL} };
 **	consistency, we insist that you furnish more information about the
 **	anchor you are creating : use newWithParent or newWithAddress.
 */
-PRIVATE HTParentAnchor * HTParentAnchor_new NOARGS
+PRIVATE HTParentAnchor0 * HTParentAnchor0_new ARGS2(
+	CONST char *,	address,
+	short,		hash)
+{
+    HTParentAnchor0 *newAnchor = typecalloc(HTParentAnchor0);
+    if (newAnchor == NULL)
+	outofmem(__FILE__, "HTParentAnchor0_new");
+
+    newAnchor->parent = newAnchor;	/* self */
+    StrAllocCopy(newAnchor->address, address);
+    newAnchor->adult_hash = hash;
+
+    return(newAnchor);
+}
+
+PRIVATE HTParentAnchor * HTParentAnchor_new ARGS1(
+	HTParentAnchor0 *,	parent)
 {
     HTParentAnchor *newAnchor = typecalloc(HTParentAnchor);
     if (newAnchor == NULL)
 	outofmem(__FILE__, "HTParentAnchor_new");
-    /* calloc: all pointers initialized to NULL */
 
-    newAnchor->parent = newAnchor;
+    newAnchor->parent = parent;		/* cross reference */
+    parent->info = newAnchor;		/* cross reference */
+    newAnchor->address = parent->address;  /* copy pointer */
+
     newAnchor->isISMAPScript = FALSE;	/* Lynx appends ?0,0 if TRUE. - FM */
     newAnchor->isHEAD = FALSE;		/* HEAD request if TRUE. - FM */
     newAnchor->safe = FALSE;		/* Safe. - FM */
@@ -85,16 +104,28 @@ PRIVATE HTParentAnchor * HTParentAnchor_new NOARGS
     return(newAnchor);
 }
 
-PRIVATE HTChildAnchor * HTChildAnchor_new NOARGS
+PRIVATE HTChildAnchor * HTChildAnchor_new ARGS1(
+	HTParentAnchor0 *,	parent)
 {
-    HTChildAnchor *p;
-
-    p = typecalloc(HTChildAnchor);
+    HTChildAnchor *p = typecalloc(HTChildAnchor);
     if (p == NULL)
 	outofmem(__FILE__, "HTChildAnchor_new");
+
+    p->parent = parent;		/* parent reference */
     return p;
 }
 
+PRIVATE HTChildAnchor * HText_pool_ChildAnchor_new ARGS1(
+	HTParentAnchor *,	parent)
+{
+    HTChildAnchor *p = (HTChildAnchor *)HText_pool_calloc((HText*)(parent->document),
+						sizeof(HTChildAnchor));
+    if (p == NULL)
+	outofmem(__FILE__, "HText_pool_ChildAnchor_new");
+
+    p->parent = parent->parent;	/* parent reference */
+    return p;
+}
 
 #ifdef CASE_INSENSITIVE_ANCHORS
 /* Case insensitive string comparison */
@@ -142,9 +173,7 @@ PRIVATE BOOL HTBEquivalent ARGS2(
 	CONST bstring *,	s,
 	CONST bstring *,	t)
 {
-    if (!isBEmpty(s)
-     && !isBEmpty(t)
-     && BStrLen(s) == BStrLen(t)) {
+    if (s && t && BStrLen(s) == BStrLen(t)) {
 	int j;
 	int len = BStrLen(s);
 	for (j = 0; j < len; ++j) {
@@ -152,7 +181,7 @@ PRIVATE BOOL HTBEquivalent ARGS2(
 		return(NO);
 	    }
 	}
-	return (HT_EQUIV(BStrData(s)[j], BStrData(t)[j]));
+	return(YES);
     } else {
 	return(s == t);		/* Two NULLs are equivalent, aren't they ? */
     }
@@ -180,21 +209,16 @@ PRIVATE int compare_anchors ARGS2(
 /*	Create new or find old sub-anchor
 **	---------------------------------
 **
-**	This one is for a new anchor being edited into an existing
-**	document.  The parent anchor must already exist.
+**	This one is for a named child.
+**	The parent anchor must already exist.
 */
-PUBLIC HTChildAnchor * HTAnchor_findChild ARGS2(
-	HTParentAnchor *,	parent,
+PRIVATE HTChildAnchor * HTAnchor_findNamedChild ARGS2(
+	HTParentAnchor0 *,	parent,
 	CONST char *,		tag)
 {
     HTChildAnchor *child;
 
-    if (!parent) {
-	CTRACE((tfp, "HTAnchor_findChild called with NULL parent.\n"));
-	return(NULL);
-    }
-
-    if (tag && *tag) {	       /* TBL */
+    if (parent && tag && *tag) {  /* TBL */
 	if (parent->children) {
 	    /*
 	    **  Parent has children.  Search them.
@@ -211,28 +235,52 @@ PUBLIC HTChildAnchor * HTAnchor_findChild ARGS2(
 	} else {  /* parent doesn't have any children yet : create family */
 	    parent->children = HTBTree_new(compare_anchors);
 	}
-    }
 
-    child = HTChildAnchor_new();
-    CTRACE((tfp, "HTAnchor: New Anchor %p named `%s' is child of %p\n",
+	child = HTChildAnchor_new(parent);
+	CTRACE((tfp, "HTAnchor: New Anchor %p named `%s' is child of %p\n",
 		(void *)child,
 		NonNull(tag),
-		(void *)parent)); /* int for apollo */
-    child->parent = parent;
+		(void *)child->parent));
 
-    if (tag && *tag) {
 	StrAllocCopy(child->tag, tag);   /* should be set before HTBTree_add */
 	HTBTree_add(parent->children, child);
+	return(child);
+
     } else {
-	child->tag = 0;
-	HTList_linkObject(&parent->children_notag, child, &child->_add_children_notag);
+	CTRACE((tfp, "HTAnchor_findNamedChild called with NULL parent.\n"));
+	return(NULL);
     }
 
+}
+
+/*
+**	This one is for a new unnamed child being edited into an existing
+**	document.  The parent anchor and the document must already exist.
+**	(Just add new unnamed child).
+*/
+PRIVATE HTChildAnchor * HTAnchor_addChild ARGS1(
+	HTParentAnchor *,	parent)
+{
+    HTChildAnchor *child;
+
+    if (!parent) {
+	CTRACE((tfp, "HTAnchor_addChild called with NULL parent.\n"));
+	return(NULL);
+    }
+
+    child = HText_pool_ChildAnchor_new(parent);
+    CTRACE((tfp, "HTAnchor: New unnamed Anchor %p is child of %p\n",
+		(void *)child,
+		(void *)child->parent));
+
+    child->tag = 0;
+    HTList_linkObject(&parent->children_notag, child, &child->_add_children_notag);
+
     return(child);
 }
 
 
-PRIVATE HTParentAnchor * HTAnchor_findAddress_nofragment PARAMS((
+PRIVATE HTParentAnchor0 * HTAnchor_findAddress_in_adult_table PARAMS((
 	CONST DocAddress *	newdoc));
 
 PRIVATE BOOL HTAnchor_link PARAMS((
@@ -260,14 +308,18 @@ PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
 	       (ltype == HTInternalLink) ? " (internal link)" : "",
 	       NonNull(href) ));
 
-    child = HTAnchor_findChild(parent, tag);
+    if (tag && *tag) {
+	child = HTAnchor_findNamedChild(parent->parent, tag);
+    } else {
+	child = HTAnchor_addChild(parent);
+    }
 
     if (href && *href) {
 	CONST char *fragment = NULL;
-	HTParentAnchor * dest;
+	HTParentAnchor0 * dest;
 
 	if (ltype == HTInternalLink && *href == '#') {
-	    dest = parent;
+	    dest = parent->parent;
 	} else {
 	    CONST char *relative_to = (parent->inBASE && *href != '#') ?
 				parent->content_base : parent->address;
@@ -288,19 +340,19 @@ PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
 	    parsed_doc.isHEAD = FALSE;
 	    parsed_doc.safe = FALSE;
 
-	    dest = HTAnchor_findAddress_nofragment(&parsed_doc);
+	    dest = HTAnchor_findAddress_in_adult_table(&parsed_doc);
 	    FREE(parsed_doc.address);
 	}
 
 	/*
 	** [from HTAnchor_findAddress()]
 	** If the address represents a sub-anchor, we load its parent (above),
-	** then we create a child anchor within that document.
+	** then we create a named child anchor within that parent.
 	*/
 	fragment = (*href == '#') ?  href+1 : HTParseAnchor(href);
 
 	if (*fragment)
-	    dest = (HTParentAnchor *)HTAnchor_findChild(dest, fragment);
+	    dest = (HTParentAnchor0 *)HTAnchor_findNamedChild(dest, fragment);
 
 
 	if (tag && *tag) {
@@ -312,7 +364,7 @@ PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
 		    CTRACE((tfp,
 			   ", different dest %p or type, creating unnamed child\n",
 			   child->dest));
-		    child = HTAnchor_findChild(parent, 0);
+		    child = HTAnchor_addChild(parent);
 		}
 	    }
 	}
@@ -321,48 +373,16 @@ PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
     return child;
 }
 
-#ifdef LY_FIND_LEAKS
-PRIVATE BOOL free_adults_atexit = FALSE;
-
-/*
-**  Function for freeing the adult hash table. - FM
-*/
-PRIVATE void free_adult_table NOARGS
-{
-    int i;
-    HTList * list;
-    HTParentAnchor * parent;
-    /*
-     *	Loop through all lists.
-     */
-    for (i = 0; i < HASH_SIZE; i++) {
-
-	list = &(adult_table[i]);
-	/*
-	**  Loop through the list.
-	*/
-	while ((parent = (HTParentAnchor *)HTList_unlinkLastObject(list)) != 0) {
-	    CTRACE((tfp, "delete anchor:%d/%d,%d,%d %s\n",
-		i, HTList_count(list) + 1,
-		(parent->physical ? 1 : 0),
-		(int)parent->underway,
-		(parent->address ? parent->address : "(no address)")));
-	    parent->underway = FALSE;
-	    HTAnchor_delete(parent);
-	}
-    }
-}
-#endif /* LY_FIND_LEAKS */
 
-/*	Create new or find old named anchor
-**	-----------------------------------
+/*	Create new or find old parent anchor
+**	------------------------------------
 **
 **	Me one is for a reference which is found in a document, and might
 **	not be already loaded.
 **	Note: You are not guaranteed a new anchor -- you might get an old one,
 **	like with fonts.
 */
-PUBLIC HTAnchor * HTAnchor_findAddress ARGS1(
+PUBLIC HTParentAnchor * HTAnchor_findAddress ARGS1(
 	CONST DocAddress *,	newdoc)
 {
     /* Anchor tag specified ? */
@@ -372,11 +392,11 @@ PUBLIC HTAnchor * HTAnchor_findAddress ARGS1(
 
     /*
     **	If the address represents a sub-anchor, we load its parent,
-    **	then we create a child anchor within that document.
+    **	then we create a named child anchor within that parent.
     */
     if (*tag) {
 	DocAddress parsed_doc;
-	HTParentAnchor * foundParent;
+	HTParentAnchor0 * foundParent;
 	HTChildAnchor * foundAnchor;
 
 	parsed_doc.address = HTParse(newdoc->address, "",
@@ -387,75 +407,85 @@ PUBLIC HTAnchor * HTAnchor_findAddress ARGS1(
 	parsed_doc.isHEAD = newdoc->isHEAD;
 	parsed_doc.safe = newdoc->safe;
 
-	foundParent = HTAnchor_findAddress_nofragment(&parsed_doc);
-	foundAnchor = HTAnchor_findChild (foundParent, tag);
+	foundParent = HTAnchor_findAddress_in_adult_table(&parsed_doc);
+	foundAnchor = HTAnchor_findNamedChild (foundParent, tag);
 	FREE(parsed_doc.address);
-	return (HTAnchor *)foundAnchor;
+	return HTAnchor_parent((HTAnchor *)foundParent);
     }
-    return (HTAnchor *)HTAnchor_findAddress_nofragment(newdoc);
+    return HTAnchor_parent((HTAnchor *)HTAnchor_findAddress_in_adult_table(newdoc));
 }
 
 
-/*  The address has no anchor tag for sure.
+/*  The address has no anchor tag, for sure.
  */
-PRIVATE HTParentAnchor * HTAnchor_findAddress_nofragment ARGS1(
+PRIVATE HTParentAnchor0 * HTAnchor_findAddress_in_adult_table ARGS1(
 	CONST DocAddress *,	newdoc)
 {
-	/*
-	**  Check whether we have this node.
-	*/
-	int hash;
-	HTList * adults;
-	HTList *grownups;
-	HTParentAnchor * foundAnchor;
-
-#ifdef LY_FIND_LEAKS
-	if (!free_adults_atexit) {
-	    atexit(free_adult_table);
-	    free_adults_atexit = TRUE;
-	}
-#endif
-	/*
-	**  Select list from hash table,
-	*/
-	hash = HASH_FUNCTION(newdoc->address);
-	adults = &(adult_table[hash]);
+    /*
+    **  Check whether we have this node.
+    */
+    int hash;
+    HTList * adults;
+    HTList *grownups;
+    HTParentAnchor0 * foundAnchor;
+    BOOL need_extra_info = (newdoc->post_data || newdoc->post_content_type ||
+		newdoc->bookmark || newdoc->isHEAD || newdoc->safe);
 
-	/*
-	**  Search list for anchor.
-	*/
-	grownups = adults;
-	while (NULL != (foundAnchor =
-			(HTParentAnchor *)HTList_nextObject(grownups))) {
-	    if (HTSEquivalent(foundAnchor->address, newdoc->address) &&
-		HTBEquivalent(foundAnchor->post_data, newdoc->post_data) &&
-		foundAnchor->isHEAD == newdoc->isHEAD)
-	    {
-		CTRACE((tfp, "Anchor %p with address `%s' already exists.\n",
-			    (void *)foundAnchor, newdoc->address));
-		return foundAnchor;
-	    }
+    /*
+     *  We need not free adult_table[] atexit -
+     *  it should be perfectly empty after free'ing all HText's.
+     *  (There is an error if it is not empty at exit). -LP
+     */
+
+    /*
+    **  Select list from hash table,
+    */
+    hash = HASH_FUNCTION(newdoc->address);
+    adults = &(adult_table[hash]);
+
+    /*
+    **  Search list for anchor.
+    */
+    grownups = adults;
+    while (NULL != (foundAnchor =
+		    (HTParentAnchor0 *)HTList_nextObject(grownups))) {
+	if (HTSEquivalent(foundAnchor->address, newdoc->address) &&
+
+	    ((!foundAnchor->info && !need_extra_info) ||
+	     (foundAnchor->info &&
+	      HTBEquivalent(foundAnchor->info->post_data, newdoc->post_data) &&
+	      foundAnchor->info->isHEAD == newdoc->isHEAD)))
+	{
+	    CTRACE((tfp, "Anchor %p with address `%s' already exists.\n",
+			(void *)foundAnchor, newdoc->address));
+	    return foundAnchor;
 	}
+    }
+
+    /*
+    **  Node not found: create new anchor.
+    */
+    foundAnchor = HTParentAnchor0_new(newdoc->address, hash);
+    CTRACE((tfp, "New anchor %p has hash %d and address `%s'\n",
+		(void *)foundAnchor, hash, newdoc->address));
+
+    if (need_extra_info) {
+	/* rare case, create a big structure */
+	HTParentAnchor *p = HTParentAnchor_new(foundAnchor);
 
-	/*
-	**  Node not found: create new anchor.
-	*/
-	foundAnchor = HTParentAnchor_new();
-	CTRACE((tfp, "New anchor %p has hash %d and address `%s'\n",
-		    (void *)foundAnchor, hash, newdoc->address));
-	StrAllocCopy(foundAnchor->address, newdoc->address);
 	if (newdoc->post_data)
-	    BStrCopy(foundAnchor->post_data, newdoc->post_data);
+	    BStrCopy(p->post_data, newdoc->post_data);
 	if (newdoc->post_content_type)
-	    StrAllocCopy(foundAnchor->post_content_type,
-			 newdoc->post_content_type);
+	    StrAllocCopy(p->post_content_type,
+		     newdoc->post_content_type);
 	if (newdoc->bookmark)
-	    StrAllocCopy(foundAnchor->bookmark, newdoc->bookmark);
-	foundAnchor->isHEAD = newdoc->isHEAD;
-	foundAnchor->safe = newdoc->safe;
-	HTList_linkObject(adults, foundAnchor, &foundAnchor->_add_adults);
+	    StrAllocCopy(p->bookmark, newdoc->bookmark);
+	p->isHEAD = newdoc->isHEAD;
+	p->safe = newdoc->safe;
+    }
+    HTList_linkObject(adults, foundAnchor, &foundAnchor->_add_adult);
 
-	return foundAnchor;
+    return foundAnchor;
 }
 
 /*	Create new or find old named anchor - simple form
@@ -464,7 +494,7 @@ PRIVATE HTParentAnchor * HTAnchor_findAddress_nofragment ARGS1(
 **     Like HTAnchor_findAddress, but simpler to use for simple cases.
 **	No post data etc. can be supplied. - kw
 */
-PUBLIC HTAnchor * HTAnchor_findSimpleAddress ARGS1(
+PUBLIC HTParentAnchor * HTAnchor_findSimpleAddress ARGS1(
 	CONST char *,	url)
 {
     DocAddress urldoc;
@@ -529,7 +559,7 @@ PRIVATE void deleteLinks ARGS1(
      *	Unregister me with our destination anchor's parent.
      */
     if (me->dest) {
-	HTParentAnchor *parent = me->dest->parent;
+	HTParentAnchor0 *parent = me->dest->parent;
 
 	/*
 	 *  Start.  Set the dest pointer to zero.
@@ -552,7 +582,8 @@ PRIVATE void deleteLinks ARGS1(
 	 *  Test here to avoid calling overhead.
 	 *  Don't delete if document is loaded or being loaded.
 	 */
-	if (!(parent->document || parent->underway)) {
+	if ((me->parent != parent) && !parent->underway &&
+	    (!parent->info || !parent->info->document)) {
 	    HTAnchor_delete(parent);
 	}
 
@@ -567,14 +598,16 @@ PRIVATE void deleteLinks ARGS1(
 }
 
 
+PRIVATE void HTParentAnchor_free PARAMS((
+	HTParentAnchor *	me));
+
 PUBLIC BOOL HTAnchor_delete ARGS1(
-	HTParentAnchor *,	me)
+	HTParentAnchor0 *,	me)
 {
     /*
      *	Memory leaks fixed.
      * 05-27-94 Lynx 2-3-1 Garrett Arch Blythe
      */
-    HTList *cur;
     HTBTElement *ele;
     HTChildAnchor *child;
 
@@ -588,29 +621,21 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
     /*
      *	Don't delete if document is loaded or being loaded.
      */
-    if (me->document || me->underway) {
+    if (me->underway || (me->info && me->info->document)) {
 	return(NO);
     }
 
     /*
      *  Mark ourselves busy, so that recursive calls of this function
-     *  on this HTParentAnchor will not free it from under our feet. - kw
+     *  on this HTParentAnchor0 will not free it from under our feet. - kw
      */
     me->underway = TRUE;
 
     {
 	/*
-	 *  Delete all outgoing links from children.
+	 *  Delete all outgoing links from named children.
 	 *  Do not delete named children itself (may have incoming links).
 	 */
-	if (!HTList_isEmpty(&me->children_notag)) {
-	    cur = &me->children_notag;
-	    while ((child =
-			(HTChildAnchor *)HTList_unlinkLastObject(cur)) != 0) {
-		deleteLinks(child);
-		FREE(child);
-	    }
-	}
 	if (me->children) {
 	    ele = HTBTree_next(me->children, NULL);
 	    while (ele != NULL) {
@@ -651,6 +676,74 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
     }
 
     /*
+     *  Delete the ParentAnchor, if any. (Document was already deleted).
+     */
+    if (me->info) {
+	HTParentAnchor_free(me->info);
+	FREE(me->info);
+    }
+
+    /*
+     *	Remove ourselves from the hash table's list.
+     */
+    HTList_unlinkObject(&(adult_table[me->adult_hash]), (void *)me);
+
+    /*
+     *	Free the address.
+     */
+    FREE(me->address);
+
+    /*
+     *	Finally, kill the parent anchor passed in.
+     */
+    FREE(me);
+
+    return(YES);
+}
+
+/*
+ *  Unnamed children (children_notag) have no sence without HText -
+ *  delete them and their links if we are about to free HText.
+ *  Document currently exists. Called within HText_free().
+ */
+PUBLIC void HTAnchor_delete_links ARGS1(
+	HTParentAnchor *,	me)
+{
+    HTList *cur;
+    HTChildAnchor *child;
+
+    /*
+     *	Do nothing if nothing to do.
+     */
+    if (!me || !me->document) {
+	return;
+    }
+
+    /*
+     *  Mark ourselves busy, so that recursive calls
+     *  on this HTParentAnchor0 will not free it from under our feet. - kw
+     */
+    me->parent->underway = TRUE;
+
+    /*
+     *  Delete all outgoing links from unnamed children.
+     */
+    if (!HTList_isEmpty(&me->children_notag)) {
+	cur = &me->children_notag;
+	while ((child =
+		(HTChildAnchor *)HTList_unlinkLastObject(cur)) != 0) {
+	    deleteLinks(child);
+	    /* child allocated in HText pool, HText_free() will free it later*/
+	}
+    }
+    me->parent->underway = FALSE;
+}
+
+
+PRIVATE void HTParentAnchor_free ARGS1(
+	HTParentAnchor *,	me)
+{
+    /*
      *	Delete the methods list.
      */
     if (me->methods) {
@@ -709,38 +802,16 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
 #endif
 
     /*
-     *	Remove ourselves from the hash table's list.
-     */
-    {
-	int i = HASH_FUNCTION(me->address);
-	HTList_unlinkObject(&(adult_table[i]), (void *)me);
-    }
-
-    /*
      *	Original code wanted a way to clean out the HTFormat if no
      *	longer needed (ref count?).  I'll leave it alone since
      *	those HTAtom objects are a little harder to know where
      *	they are being referenced all at one time. (near static)
      */
 
-    /*
-     *	Free the address.
-     */
-    FREE(me->address);
-
     FREE(me->UCStages);
     ImageMapList_free(me->imaps);
-
-
-    /*
-     *	Finally, kill the parent anchor passed in.
-     */
-    FREE(me);
-
-    return(YES);
 }
 
-
 #ifdef SOURCE_CACHE
 PUBLIC void HTAnchor_clearSourceCache ARGS1(
 	HTParentAnchor *,	me)
@@ -769,7 +840,14 @@ PUBLIC void HTAnchor_clearSourceCache ARGS1(
 PUBLIC HTParentAnchor * HTAnchor_parent ARGS1(
 	HTAnchor *,	me)
 {
-    return( me ? me->parent : NULL);
+    if (!me)
+	return NULL;
+
+    if (me->parent->info)
+	return me->parent->info;
+
+    /* else: create a new structure */
+    return HTParentAnchor_new(me->parent);
 }
 
 PUBLIC void HTAnchor_setDocument ARGS2(
@@ -793,7 +871,8 @@ PUBLIC char * HTAnchor_address ARGS1(
     char *addr = NULL;
 
     if (me) {
-	if (((HTParentAnchor *)me == me->parent) ||
+	if (((HTParentAnchor0 *)me == me->parent) ||
+	    ((HTParentAnchor *)me == me->parent->info) ||
 	    !((HTChildAnchor *)me)->tag) {  /* it's an adult or no tag */
 	    StrAllocCopy(addr, me->parent->address);
 	} else {  /* it's a named child */
@@ -849,7 +928,7 @@ PUBLIC BOOL HTAnchor_isIndex ARGS1(
 PUBLIC BOOL HTAnchor_isISMAPScript ARGS1(
 	HTAnchor *,	me)
 {
-    return( me ? me->parent->isISMAPScript : NO);
+    return( (me && me->parent->info) ? me->parent->info->isISMAPScript : NO);
 }
 
 #if defined(USE_COLOR_STYLE)
diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h
index 50a180aa..2083f862 100644
--- a/WWW/Library/Implementation/HTAnchor.h
+++ b/WWW/Library/Implementation/HTAnchor.h
@@ -27,27 +27,49 @@
 typedef struct _HyperDoc HyperDoc;  /* Ready for forward references */
 typedef struct _HTAnchor HTAnchor;
 typedef struct _HTParentAnchor HTParentAnchor;
+typedef struct _HTParentAnchor0 HTParentAnchor0;
 
 /*	After definition of HTFormat: */
 #include <HTFormat.h>
 
 
 struct _HTAnchor {		/* Generic anchor */
-  HTParentAnchor * parent;	/* Parent of this anchor (self for adults) */
+  HTParentAnchor0 * parent;	/* Parent of this anchor (self for adults) */
 };
 
+struct _HTParentAnchor0 {	/* One for adult_table,
+				 * generally not used outside HTAnchor.c */
+  /* Common part from the generic anchor structure */
+  HTParentAnchor0 * parent;	/* (self) */
+
+  /* ParentAnchor0-specific information */
+  char		  * address;	/* Absolute address of this node */
+  HTParentAnchor  * info;	/* additional info, allocated on demand */
+
+  HTBTree *	children;	/* Subanchors <a name="tag">, sorted by tag */
+  HTList	sources;	/* List of anchors pointing to this, if any */
+
+  HTList	_add_adult;	/* - just a memory for list entry:) */
+  short		adult_hash;	/* adult list number */
+  BOOL		underway;	/* Document about to be attached to it */
+};
+
+/*
+ *  Separated from the above to save memory:  allocated on demand,
+ *  it is nearly 1:1 to HText (well, sometimes without HText...),
+ *  available for SGML, HTML, and HText stages.
+ *  [being precise, we currently allocate it before HTLoadDocument(),
+ *  in HTAnchor_findAddress() and HTAnchor_parent()].
+ */
 struct _HTParentAnchor {
   /* Common part from the generic anchor structure */
-  HTParentAnchor * parent;	/* Parent of this anchor (self) */
+  HTParentAnchor0 * parent;	/* Parent of this anchor */
 
   /* ParentAnchor-specific information */
-  HTBTree *	children;	/* Subanchors <a name="tag">, sorted by tag */
   HTList	children_notag;	/* Subanchors <a href=...>, tag is NULL */
-  HTList	sources;	/* List of anchors pointing to this, if any */
-  HTList	_add_adults;	/* - just a memory for list entry:) */
+  HyperDoc *	document;	/* The document within which this is an anchor*/
 
-  HyperDoc *	document;	/* The document within which this is an anchor */
-  char *	address;	/* Absolute address of this node */
+  char *	address;	/* parent->address, a pointer */
   bstring *	post_data;	/* Posting data */
   char *	post_content_type;  /* Type of post data */
   char *	bookmark;	/* Bookmark filename */
@@ -67,7 +89,6 @@ struct _HTParentAnchor {
   HTList*	methods;	/* Methods available as HTAtoms */
   void *	protocol;	/* Protocol object */
   char *	physical;	/* Physical address */
-  BOOL		underway;	/* Document about to be attached to it */
   BOOL		isISMAPScript;	/* Script for clickable image map */
   BOOL		isHEAD;		/* Document is headers from a HEAD request */
   BOOL		safe;			/* Safe */
@@ -103,7 +124,7 @@ typedef HTAtom HTLinkType;
 
 typedef struct {
   /* Common part from the generic anchor structure */
-  HTParentAnchor * parent;	/* Parent of this anchor */
+  HTParentAnchor0 * parent;	/* Parent of this anchor */
 
   /* ChildAnchor-specific information */
   char *	tag;		/* #fragment,  relative to the parent */
@@ -131,16 +152,6 @@ typedef struct _DocAddress {
 /* "internal" means "within the same document, with certainty". */
 extern HTLinkType * HTInternalLink;
 
-/*	Create new or find old sub-anchor
-**	---------------------------------
-**
-**	This one is for a new anchor being edited into an existing
-**	document.  The parent anchor must already exist.
-*/
-extern HTChildAnchor * HTAnchor_findChild PARAMS((
-	HTParentAnchor *	parent,
-	CONST char *		tag));
-
 /*	Create or find a child anchor with a possible link
 **	--------------------------------------------------
 **
@@ -154,15 +165,15 @@ extern HTChildAnchor * HTAnchor_findChildAndLink PARAMS((
 	CONST char * href,		/* May be "" or 0 */
 	HTLinkType * ltype));		/* May be 0 */
 
-/*	Create new or find old named anchor
-**	-----------------------------------
+/*	Create new or find old parent anchor
+**	------------------------------------
 **
 **	This one is for a reference which is found in a document, and might
 **	not be already loaded.
 **	Note: You are not guaranteed a new anchor -- you might get an old one,
 **	like with fonts.
 */
-extern HTAnchor * HTAnchor_findAddress PARAMS((
+extern HTParentAnchor * HTAnchor_findAddress PARAMS((
 	CONST DocAddress *	address));
 
 /*	Create new or find old named anchor - simple form
@@ -171,7 +182,7 @@ extern HTAnchor * HTAnchor_findAddress PARAMS((
 **	Like the previous one, but simpler to use for simple cases.
 **	No post data etc. can be supplied. - kw
 */
-extern HTAnchor * HTAnchor_findSimpleAddress PARAMS((
+extern HTParentAnchor * HTAnchor_findSimpleAddress PARAMS((
 	CONST char *	url));
 
 /*	Delete an anchor and possibly related things (auto garbage collection)
@@ -184,6 +195,14 @@ extern HTAnchor * HTAnchor_findSimpleAddress PARAMS((
 **	If this anchor's sources list is empty, we delete it and its children.
 */
 extern BOOL HTAnchor_delete PARAMS((
+	HTParentAnchor0 *	me));
+
+/*
+ *  Unnamed children (children_notag) have no sense without HText -
+ *  delete them and their links if we are about to free HText.
+ *  Document currently exists.  Called within HText_free().
+ */
+extern void HTAnchor_delete_links PARAMS((
 	HTParentAnchor *	me));
 
 #ifdef SOURCE_CACHE
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 222baabf..d88bcf01 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -2625,7 +2625,7 @@ PRIVATE int read_directory ARGS4(
     **	we could someday set up an equivalent listing
     **	for Unix ftp servers. - FM
     */
-    need_parent_link = HTDirTitles(target, (HTAnchor*)parent, tildeIsTop);
+    need_parent_link = HTDirTitles(target, parent, tildeIsTop);
 
     data_read_pointer = data_write_pointer = data_buffer;
 
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 03f427b6..34a01106 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1112,7 +1112,7 @@ PUBLIC void LYGetFileInfo ARGS7(
 	 */
 	Afn = HTEscape(filename, URL_PATH);
 	LYLocalFileToURL(&Aname, Afn);
-	file_anchor = HTAnchor_parent(HTAnchor_findSimpleAddress(Aname));
+	file_anchor = HTAnchor_findSimpleAddress(Aname);
 
 	file_csname = file_anchor->charset;
 	format = HTFileFormat(filename, &myEnc, pdesc);
@@ -1279,11 +1279,10 @@ PUBLIC BOOL HTEditable ARGS1(
 PUBLIC HTStream * HTFileSaveStream ARGS1(
 	HTParentAnchor *,	anchor)
 {
-    char * addr = HTAnchor_address((HTAnchor*)anchor);
+    CONST char * addr = anchor->address;
     char * localname = HTLocalName(addr);
     FILE * fp = fopen(localname, BIN_W);
 
-    FREE(addr);
     FREE(localname);
     if (!fp)
 	return NULL;
@@ -1353,10 +1352,10 @@ PUBLIC void HTDirEntry ARGS3(
 */
 PUBLIC BOOL HTDirTitles ARGS3(
 	HTStructured *, target,
-	HTAnchor *,	anchor,
+	HTParentAnchor *, anchor,
 	BOOL,		tildeIsTop)
 {
-    char * logical = HTAnchor_address(anchor);
+    CONST char * logical = anchor->address;
     char * path = HTParse(logical, "", PARSE_PATH + PARSE_PUNCTUATION);
     char * current;
     char * cp = NULL;
@@ -1449,7 +1448,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
 	  (0 == strncasecomp(printable, "anonymou.", 9) &&
 	   strchr(printable, '/') == NULL)) {
 	  FREE(printable);
-	  FREE(logical);
 	  FREE(path);
 	  return(need_parent_link);
       }
@@ -1473,7 +1471,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
 	     (!strcmp(parent, "/..") ||
 	      !strncasecomp(parent, "/%2F", 4))) ||
 	    !strncasecomp(current, "%2F", 3)) {
-	    FREE(logical);
 	    FREE(path);
 	    return(need_parent_link);
 	}
@@ -1529,7 +1526,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
 		HTUnEscape(fullparentpath);
 		if ((dp = opendir(fullparentpath)) == NULL) {
 		    FREE(fullparentpath);
-		    FREE(logical);
 		    FREE(relative);
 		    FREE(path);
 		    return(need_parent_link);
@@ -1538,7 +1534,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
 		FREE(fullparentpath);
 #ifdef LONG_LIST
 		need_parent_link = TRUE;
-		FREE(logical);
 		FREE(path);
 		FREE(relative);
 		return(need_parent_link);
@@ -1573,7 +1568,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
     }
 #endif /* !NO_PARENT_DIR_REFERENCE */
 
-    FREE(logical);
     FREE(path);
     return(need_parent_link);
 }
@@ -1681,7 +1675,6 @@ PRIVATE int print_local_dir ARGS5(
     HTStructured *target;	/* HTML object */
     HTStructuredClass targetClass;
     STRUCT_DIRENT * dirbuf;
-    char *logical = NULL;
     char *pathname = NULL;
     char *tail = NULL;
     BOOL present[HTML_A_ATTRIBUTES];
@@ -1692,8 +1685,7 @@ PRIVATE int print_local_dir ARGS5(
 
     CTRACE((tfp, "print_local_dir() started\n"));
 
-    logical = HTAnchor_address((HTAnchor*)anchor);
-    pathname = HTParse(logical, "",
+    pathname = HTParse(anchor->address, "",
 		       PARSE_PATH + PARSE_PUNCTUATION);
 
     if (!strcmp(pathname,"/")) {
@@ -1740,12 +1732,11 @@ PRIVATE int print_local_dir ARGS5(
     **	is not defined so that need we to create the
     **	link via an LYListFmtParse() call. - FM
     */
-    need_parent_link = HTDirTitles(target,
-				   (HTAnchor *)anchor, FALSE);
+    need_parent_link = HTDirTitles(target, anchor, FALSE);
 
 #ifdef DIRED_SUPPORT
     if (!isLYNXCGI(anchor->address)) {
-	HTAnchor_setFormat((HTParentAnchor *) anchor, WWW_DIRED);
+	HTAnchor_setFormat(anchor, WWW_DIRED);
 	lynx_edit_mode = TRUE;
     }
 #endif /* DIRED_SUPPORT */
@@ -2010,7 +2001,6 @@ PRIVATE int print_local_dir ARGS5(
 	    }
 	} /* end printing out the tree in order */
 
-	FREE(logical);
 	FREE(tmpfilename);
 	FREE(tail);
 	HTBTreeAndObject_free(bt);
@@ -2765,7 +2755,8 @@ PUBLIC CONST char * HTGetProgramPath ARGS1(
 }
 
 /*
- * Store a program's path
+ * Store a program's path.  The caller must allocate the string used for 'path',
+ * since HTInitProgramPaths() may free it.
  */
 PUBLIC void HTSetProgramPath ARGS2(
 	ProgramPaths,	code,
diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h
index 30a08045..2244eae4 100644
--- a/WWW/Library/Implementation/HTFile.h
+++ b/WWW/Library/Implementation/HTFile.h
@@ -69,7 +69,7 @@ extern char * HTCacheFileName PARAMS((CONST char * name));
 */
 extern BOOL HTDirTitles PARAMS((
         HTStructured *  target,
-        HTAnchor *      anchor,
+        HTParentAnchor* anchor,
 	BOOL		tildeIsTop));
 
 /*
diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c
index 7864b52e..09b221d5 100644
--- a/WWW/Library/Implementation/HTNews.c
+++ b/WWW/Library/Implementation/HTNews.c
@@ -2310,7 +2310,7 @@ PRIVATE int HTLoadNews ARGS4(
 		    NEWS_NETCLOSE(s);
 		    s = -1;
 		}
-	    StrAllocCopy(NewsHost, cp);
+		StrAllocCopy(NewsHost, cp);
 	    }
 	    FREE(cp);
 	    sprintf(command, "%s//%.250s/", STR_SNEWS_URL, NewsHost);
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index eef67b87..993750c3 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -59,14 +59,6 @@ PUBLIC int BSDselect PARAMS((
 
 #include <LYLeaks.h>
 
-#ifndef FD_SETSIZE
-#if defined(UCX) || defined(SOCKETSHR_TCP) || defined(CMU_TCP)
-#define FD_SETSIZE 32
-#else
-#define FD_SETSIZE 256
-#endif /* Limit # sockets to 32 for UCX, BSN - also SOCKETSHR and CMU, AH */
-#endif /* FD_SETSIZE */
-
 /*
 **  Module-Wide variables
 */
@@ -1727,11 +1719,11 @@ PUBLIC int HTDoConnect ARGS4(
 	    FD_SET((unsigned) *s, &writefds);
 #ifdef SOCKS
 	    if (socks_flag)
-		ret = Rselect(FD_SETSIZE, NULL,
+		ret = Rselect((unsigned)*s + 1, NULL,
 			      (void *)&writefds, NULL, &select_timeout);
 	    else
 #endif /* SOCKS */
-	    ret = select(FD_SETSIZE, NULL, (void *)&writefds, NULL, &select_timeout);
+	    ret = select((unsigned)*s + 1, NULL, (void *)&writefds, NULL, &select_timeout);
 
 #ifdef SOCKET_DEBUG_TRACE
 	    if (tries == 1) {
@@ -1999,11 +1991,11 @@ PUBLIC int HTDoRead ARGS3(
 	    FD_SET((unsigned)fildes, &readfds);
 #ifdef SOCKS
 	    if (socks_flag)
-		ret = Rselect(FD_SETSIZE,
+		ret = Rselect((unsigned)fildes + 1,
 			      (void *)&readfds, NULL, NULL, &select_timeout);
 	    else
 #endif /* SOCKS */
-		ret = select(FD_SETSIZE,
+		ret = select((unsigned)fildes + 1,
 			     (void *)&readfds, NULL, NULL, &select_timeout);
 	} while ((ret == -1) && (errno == EINTR));
 
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 4f8f256f..0ade2219 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -70,11 +70,11 @@ PRIVATE int HTSSLCallback(int preverify_ok, X509_STORE_CTX *x509_ctx)
     char *msg = NULL;
     int result = 1;
 
-    if (!(preverify_ok || ssl_okay)) {
+    if (!(preverify_ok || ssl_okay || ssl_noprompt)) {
 
 	HTSprintf0(&msg, "SSL error:%s-Continue?",
 		   X509_verify_cert_error_string(X509_STORE_CTX_get_error(x509_ctx)));
-	if (HTConfirmDefault(msg, TRUE))
+	if (HTForcedPrompt(ssl_noprompt, msg, YES))
 	    ssl_okay = 1;
 	else
 	    result = 0;
@@ -595,7 +595,7 @@ use_tunnel:
       if ((cert_host = strstr(ssl_dn, "/CN=")) == NULL) {
 	  HTSprintf0(&msg,
 		     gettext("SSL error:Can't find common name in certificate-Continue?"));
-	  if (! HTConfirmDefault(msg, TRUE)) {
+	   if (! HTForcedPrompt(ssl_noprompt, msg, YES)) {
 	      status = HT_NOT_LOADED;
 	      FREE(msg);
 	      goto done;
@@ -610,7 +610,7 @@ use_tunnel:
 			 gettext("SSL error:host(%s)!=cert(%s)-Continue?"),
 			 ssl_host,
 			 cert_host);
-	      if (! HTConfirmDefault(msg, TRUE)) {
+	      if (! HTForcedPrompt(ssl_noprompt, msg, YES)) {
 		  status = HT_NOT_LOADED;
 		  FREE(msg);
 		  goto done;
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 9a1f7535..81304445 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -197,6 +197,8 @@ struct _HTStream {
     BOOL			no_lynx_specialcodes;
     int				current_attribute_number;
     HTChunk			*string;
+    int				leading_spaces;
+    int				trailing_spaces;
     HTElement			*element_stack;
     sgml_state			state;
     unsigned char kanji_buf;
@@ -1552,6 +1554,7 @@ PRIVATE void SGML_character ARGS2(
     HTTag * testtag = NULL;
     BOOLEAN chk;	/* Helps (?) walk through all the else ifs... */
     UCode_t clong, uck = 0; /* Enough bits for UCS4 ... */
+    int testlast;
 #ifdef CJK_EX
     unsigned char c;
 #else
@@ -2207,16 +2210,30 @@ top1:
 	    testtag = context->element_stack ?
 		context->element_stack->tag : NULL;
 
-	if (TOUPPER(c) != ((string->size == 1) ?
-					   '/' :
-			   testtag->name[string->size-2])) {
+	if (testtag == NULL) {
+	    string->size--;
+	    context->state = S_text;
+	    goto top1;
+	}
+
+	/*
+	 * Normally when we get the closing ">",
+	 *	testtag contains something like "TITLE"
+	 *	string contains something like "/title>"
+	 * so we decrement by 2 to compare the final character of each.
+	 */
+	testlast = string->size - 2 - context->trailing_spaces - context->leading_spaces;
+
+	if (TOUPPER(c) != ((testlast < 0)
+			    ? '/'
+			    : testtag->name[testlast])) {
 	    int i;
 
 	    /*
 	    **	If complete match, end litteral.
 	    */
-	    if ((c == '>') && testtag &&
-		string->size > 1 && !testtag->name[string->size-2]) {
+	    if ((c == '>') &&
+		testlast >= 0 && !testtag->name[testlast]) {
 #ifdef USE_PRETTYSRC
 		if (psrc_view) {
 		    PSRCSTART(abracket);
@@ -2250,12 +2267,33 @@ top1:
 		break;
 	    }
 
+	    /*
+	     * Allow whitespace between the "<" or ">" and the keyword, for
+	     * error-recovery.
+	     */
+	    if (isspace(UCH(c))) {
+		if (testlast == -1) {
+		    context->leading_spaces += 1;
+		    CTRACE2(TRACE_SGML, (tfp, "leading spaces: %d\n", context->leading_spaces));
+		    break;
+		} else if (testlast > 0) {
+		    context->trailing_spaces += 1;
+		    CTRACE2(TRACE_SGML, (tfp, "trailing spaces: %d\n", context->trailing_spaces));
+		    break;
+		}
+	    }
+
+	    /*
+	     * Mismatch - recover.
+	     */
+	    context->leading_spaces = 0;
+	    context->trailing_spaces = 0;
 	    if (((testtag->contents != SGML_LITTERAL &&
 		  (testtag->flags & Tgf_strict)) ||
 		 (context->state == S_pcdata &&
 		  (testtag->flags & (Tgf_strict|Tgf_endO)))) &&
-		(string->size > 1 &&
-		 (c == '>' || string->size > 2 || IsNmStart(c)))) {
+		(testlast > -1 &&
+		 (c == '>' || testlast > 0 || IsNmStart(c)))) {
 		context->state = S_end;
 		string->size--;
 		for (i = 0; i < string->size; i++)  /* remove '/' */
@@ -2267,7 +2305,7 @@ top1:
 	    }
 	    if (context->state == S_pcdata &&
 		(testtag->flags & (Tgf_strict|Tgf_endO)) &&
-		(string->size == 1 && IsNmStart(c))) {
+		(testlast < 0 && IsNmStart(c))) {
 		context->state = S_tag;
 		break;
 	    }
@@ -4409,6 +4447,8 @@ PUBLIC HTStream* SGML_new  ARGS3(
 
     context->isa = &SGMLParser;
     context->string = HTChunkCreate(128);	/* Grow by this much */
+    context->leading_spaces = 0;
+    context->trailing_spaces = 0;
     context->dtd = dtd;
     context->target = target;
     context->actions = (CONST HTStructuredClass*)(((HTStream*)target)->isa);
diff --git a/aclocal.m4 b/aclocal.m4
index a3122683..ec6bc974 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4,7 +4,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/1/28
-dnl Updated: 2002/12/31
+dnl Updated: 2003/05/28
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13, patched
 dnl by Tom Dickey.  See your local GNU archives, and this URL:
@@ -12,6 +12,8 @@ dnl http://invisible-island.net/autoconf/autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
+dnl AM_GNU_GETTEXT version: 10 updated: 2002/11/17 17:25:28
+dnl --------------
 dnl Usage: Just like AM_WITH_NLS, which see.
 AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
@@ -89,6 +91,8 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_ICONV version: 3 updated: 2002/10/27 23:21:42
+dnl --------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl iconv.m4
@@ -162,6 +166,8 @@ size_t iconv();
   AC_SUBST(LIBICONV)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_LANGINFO_CODESET version: 3 updated: 2002/10/27 23:21:42
+dnl -------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl codeset.m4
@@ -183,6 +189,8 @@ AC_DEFUN([AM_LANGINFO_CODESET],
   fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_LC_MESSAGES version: 4 updated: 2002/10/27 23:21:42
+dnl --------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl lcmessage.m4
@@ -212,6 +220,8 @@ AC_DEFUN([AM_LC_MESSAGES],
     fi
   fi])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_PATH_PROG_WITH_TEST version: 5 updated: 2002/10/27 23:21:42
+dnl ----------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl progtest.m4
@@ -269,6 +279,8 @@ fi
 AC_SUBST($1)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_WITH_NLS version: 15 updated: 2002/11/09 16:19:53
+dnl -----------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl gettext.m4
@@ -1365,12 +1377,13 @@ dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
 AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_ECHO version: 9 updated: 1999/09/09 00:28:43
+dnl CF_DISABLE_ECHO version: 10 updated: 2003/04/17 22:27:11
 dnl ---------------
 dnl You can always use "make -n" to see the actual options, but it's hard to
 dnl pick out/analyze warning messages when the compile-line is long.
 dnl
 dnl Sets:
+dnl	ECHO_LT - symbol to control if libtool is verbose
 dnl	ECHO_LD - symbol to prefix "cc -o" lines
 dnl	RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
 dnl	SHOW_CC - symbol to put before explicit "cc -c" lines
@@ -1381,17 +1394,20 @@ AC_MSG_CHECKING(if you want to see long compiling messages)
 CF_ARG_DISABLE(echo,
 	[  --disable-echo          display "compiling" commands],
 	[
+    ECHO_LT='--silent'
     ECHO_LD='@echo linking [$]@;'
     RULE_CC='	@echo compiling [$]<'
     SHOW_CC='	@echo compiling [$]@'
     ECHO_CC='@'
 ],[
+    ECHO_LT=''
     ECHO_LD=''
     RULE_CC='# compiling'
     SHOW_CC='# compiling'
     ECHO_CC=''
 ])
 AC_MSG_RESULT($enableval)
+AC_SUBST(ECHO_LT)
 AC_SUBST(ECHO_LD)
 AC_SUBST(RULE_CC)
 AC_SUBST(SHOW_CC)
@@ -1919,7 +1935,21 @@ rm -rf conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 12 updated: 2002/11/23 16:02:49
+dnl CF_GCC_VERSION version: 2 updated: 2003/05/24 15:01:41
+dnl --------------
+dnl Find version of gcc
+AC_DEFUN([CF_GCC_VERSION],[
+AC_REQUIRE([AC_PROG_CC])
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	AC_MSG_CHECKING(version of $CC)
+	GCC_VERSION="`${CC} --version|head -1 | sed -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	AC_MSG_RESULT($GCC_VERSION)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GCC_WARNINGS version: 14 updated: 2003/05/24 15:03:15
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -1927,11 +1957,13 @@ dnl
 dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
 dnl	-Wredundant-decls (system headers make this too noisy)
 dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
-dnl	-Wwrite-strings (too noisy, but should review occasionally)
+dnl	-Wwrite-strings (too noisy, but should review occasionally).  This
+dnl		is enabled for ncurses using "--enable-const".
 dnl	-pedantic
 dnl
 AC_DEFUN([CF_GCC_WARNINGS],
 [
+AC_REQUIRE([CF_GCC_VERSION])
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
 	cat > conftest.$ac_ext <<EOF
@@ -1959,8 +1991,19 @@ EOF
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 		if AC_TRY_EVAL(ac_compile); then
 			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
+			case $cf_opt in #(vi
+			Wcast-qual) #(vi
+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+				;;
+			Winline) #(vi
+				case $GCC_VERSION in
+				3.3*)
+					CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+					continue;;
+				esac
+				;;
+			esac
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
@@ -1999,7 +2042,7 @@ make an error
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNUTLS version: 1 updated: 2003/04/13 17:26:30
+dnl CF_GNUTLS version: 2 updated: 2003/04/28 01:28:08
 dnl ---------
 dnl Check for gnutls library (TLS "is" SSL)
 dnl $1 = the [optional] directory in which the library may be found
@@ -4102,6 +4145,8 @@ to makefile.])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl jm_GLIBC21 version: 3 updated: 2002/10/27 23:21:42
+dnl ----------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl glibc21.m4
diff --git a/configure b/configure
index 642e3025..2384ef8d 100755
--- a/configure
+++ b/configure
@@ -1276,6 +1276,7 @@ if test "${enable_echo+set}" = set; then
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
     
+    ECHO_LT='--silent'
     ECHO_LD='@echo linking $@;'
     RULE_CC='	@echo compiling $<'
     SHOW_CC='	@echo compiling $@'
@@ -1283,6 +1284,7 @@ if test "${enable_echo+set}" = set; then
  
   else
     
+    ECHO_LT=''
     ECHO_LD=''
     RULE_CC='# compiling'
     SHOW_CC='# compiling'
@@ -1292,6 +1294,7 @@ if test "${enable_echo+set}" = set; then
 else
   enableval=yes 
   
+    ECHO_LT=''
     ECHO_LD=''
     RULE_CC='# compiling'
     SHOW_CC='# compiling'
@@ -1307,6 +1310,7 @@ echo "$ac_t""$enableval" 1>&6
 
 
 
+
 # special case for WWW/*
 if test -n "$ECHO_CC" ; then
 	DONT_ECHO_CC="$SHOW_CC ;"
@@ -1316,7 +1320,7 @@ fi
 
 
 echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6
-echo "configure:1320: checking if you want to check memory-leaks" >&5
+echo "configure:1324: checking if you want to check memory-leaks" >&5
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
 if test "${enable_find_leaks+set}" = set; then
@@ -1343,7 +1347,7 @@ EOF
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
 echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6
-echo "configure:1347: checking if you want to enable debug-code" >&5
+echo "configure:1351: checking if you want to enable debug-code" >&5
 
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -1385,7 +1389,7 @@ else
 fi
 
 echo $ac_n "checking if you want to enable lynx trace code *recommended* ""... $ac_c" 1>&6
-echo "configure:1389: checking if you want to enable lynx trace code *recommended* " >&5
+echo "configure:1393: checking if you want to enable lynx trace code *recommended* " >&5
 
 # Check whether --enable-trace or --disable-trace was given.
 if test "${enable_trace+set}" = set; then
@@ -1409,7 +1413,7 @@ EOF
 
 
 echo $ac_n "checking if you want verbose trace code""... $ac_c" 1>&6
-echo "configure:1413: checking if you want verbose trace code" >&5
+echo "configure:1417: checking if you want verbose trace code" >&5
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
 if test "${enable_vertrace+set}" = set; then
@@ -1435,7 +1439,7 @@ EOF
 if test -n "$GCC"
 then
 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:1439: checking if you want to turn on gcc warnings" >&5
+echo "configure:1443: checking if you want to turn on gcc warnings" >&5
 
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
@@ -1475,9 +1479,9 @@ EOF
 if test "$GCC" = yes
 then
 	echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:1479: checking for $CC __attribute__ directives" >&5
+echo "configure:1483: checking for $CC __attribute__ directives" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1481 "configure"
+#line 1485 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -1515,7 +1519,7 @@ EOF
 EOF
 			;;
 		esac
-		if { (eval echo configure:1519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:1523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -1527,14 +1531,26 @@ rm -rf conftest*
 fi
 
 	
+
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
+echo "configure:1539: checking version of $CC" >&5
+	GCC_VERSION="`${CC} --version|head -1 | sed -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	echo "$ac_t""$GCC_VERSION" 1>&6
+fi
+
+
+
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
 	cat > conftest.$ac_ext <<EOF
-#line 1534 "configure"
+#line 1550 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 	echo "checking for $CC warning options" 1>&6
-echo "configure:1538: checking for $CC warning options" >&5
+echo "configure:1554: checking for $CC warning options" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
 	cf_warn_CONST=""
@@ -1553,10 +1569,22 @@ echo "configure:1538: checking for $CC warning options" >&5
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo configure:1557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
+			case $cf_opt in #(vi
+			Wcast-qual) #(vi
+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+				;;
+			Winline) #(vi
+				case $GCC_VERSION in
+				3.3*)
+					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+
+					continue;;
+				esac
+				;;
+			esac
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
@@ -1568,7 +1596,7 @@ fi
 fi
 
 echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6
-echo "configure:1572: checking if you want to link with dbmalloc for testing" >&5
+echo "configure:1600: checking if you want to link with dbmalloc for testing" >&5
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
 if test "${with_dbmalloc+set}" = set; then
@@ -1581,7 +1609,7 @@ fi
 echo "$ac_t""$with_dbmalloc" 1>&6
 if test $with_dbmalloc = yes ; then
 	echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6
-echo "configure:1585: checking for debug_malloc in -ldbmalloc" >&5
+echo "configure:1613: checking for debug_malloc in -ldbmalloc" >&5
 ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1589,7 +1617,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldbmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1593 "configure"
+#line 1621 "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
@@ -1600,7 +1628,7 @@ int main() {
 debug_malloc()
 ; return 0; }
 EOF
-if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1632: \"$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
@@ -1630,7 +1658,7 @@ fi
 fi
 
 echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6
-echo "configure:1634: checking if you want to link with dmalloc for testing" >&5
+echo "configure:1662: checking if you want to link with dmalloc for testing" >&5
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@@ -1643,7 +1671,7 @@ fi
 echo "$ac_t""$with_dmalloc" 1>&6
 if test $with_dmalloc = yes ; then
 	echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6
-echo "configure:1647: checking for dmalloc_debug in -ldmalloc" >&5
+echo "configure:1675: checking for dmalloc_debug in -ldmalloc" >&5
 ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1651,7 +1679,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1655 "configure"
+#line 1683 "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
@@ -1662,7 +1690,7 @@ int main() {
 dmalloc_debug()
 ; return 0; }
 EOF
-if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1694: \"$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
@@ -1698,12 +1726,12 @@ EOF
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1702: checking for working const" >&5
+echo "configure:1730: 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 1707 "configure"
+#line 1735 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1752,7 +1780,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1794,7 +1822,7 @@ clix*)
 	# 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:1798: checking for strcmp in -lc_s" >&5
+echo "configure:1826: 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
@@ -1802,7 +1830,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1806 "configure"
+#line 1834 "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
@@ -1813,7 +1841,7 @@ int main() {
 strcmp()
 ; return 0; }
 EOF
-if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1845: \"$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
@@ -1911,7 +1939,7 @@ do
 # 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:1915: checking for $ac_word" >&5
+echo "configure:1943: 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
@@ -1956,17 +1984,17 @@ sony-newsos*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1960: checking for $ac_hdr" >&5
+echo "configure:1988: 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 1965 "configure"
+#line 1993 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1998: \"$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*
@@ -2010,17 +2038,17 @@ ultrix*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2014: checking for $ac_hdr" >&5
+echo "configure:2042: 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 2019 "configure"
+#line 2047 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2052: \"$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*
@@ -2057,7 +2085,7 @@ esac
 if test -z "$GCC" ; then
 	
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2061: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2089: 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
@@ -2113,7 +2141,7 @@ fi
 
 
 	cat > conftest.$ac_ext <<EOF
-#line 2117 "configure"
+#line 2145 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -2129,7 +2157,7 @@ int main() {
 	struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:2133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -2193,12 +2221,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2197: checking for ANSI C header files" >&5
+echo "configure:2225: 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 2202 "configure"
+#line 2230 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2206,7 +2234,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2238: \"$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*
@@ -2223,7 +2251,7 @@ rm -f conftest*
 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 2227 "configure"
+#line 2255 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2241,7 +2269,7 @@ fi
 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 2245 "configure"
+#line 2273 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2262,7 +2290,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2266 "configure"
+#line 2294 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2273,7 +2301,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2297,21 +2325,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2301: checking for inline" >&5
+echo "configure:2329: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2336 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2337,12 +2365,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2341: checking for off_t" >&5
+echo "configure:2369: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2346 "configure"
+#line 2374 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2370,12 +2398,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2374: checking for size_t" >&5
+echo "configure:2402: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2379 "configure"
+#line 2407 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2405,19 +2433,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2409: checking for working alloca.h" >&5
+echo "configure:2437: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2442 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -2438,12 +2466,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2442: checking for alloca" >&5
+echo "configure:2470: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2447 "configure"
+#line 2475 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2471,7 +2499,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -2503,12 +2531,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2507: checking whether alloca needs Cray hooks" >&5
+echo "configure:2535: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2512 "configure"
+#line 2540 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2533,12 +2561,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2537: checking for $ac_func" >&5
+echo "configure:2565: 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 2542 "configure"
+#line 2570 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2561,7 +2589,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2593: \"$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
@@ -2588,7 +2616,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2592: checking stack direction for C alloca" >&5
+echo "configure:2620: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2596,7 +2624,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2600 "configure"
+#line 2628 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2615,7 +2643,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2640,17 +2668,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2644: checking for $ac_hdr" >&5
+echo "configure:2672: 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 2649 "configure"
+#line 2677 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2682: \"$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*
@@ -2679,12 +2707,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2683: checking for $ac_func" >&5
+echo "configure:2711: 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 2688 "configure"
+#line 2716 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2707,7 +2735,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2739: \"$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
@@ -2732,7 +2760,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2736: checking for working mmap" >&5
+echo "configure:2764: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2740,7 +2768,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2744 "configure"
+#line 2772 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2880,7 +2908,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2904,12 +2932,12 @@ fi
 
 
     echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-echo "configure:2908: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "configure:2936: checking whether we are using the GNU C Library 2.1 or newer" >&5
 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2913 "configure"
+#line 2941 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -2958,17 +2986,17 @@ stdlib.h string.h unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2962: checking for $ac_hdr" >&5
+echo "configure:2990: 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 2967 "configure"
+#line 2995 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3000: \"$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*
@@ -2999,12 +3027,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3003: checking for $ac_func" >&5
+echo "configure:3031: 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 3008 "configure"
+#line 3036 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3027,7 +3055,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3059: \"$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
@@ -3068,7 +3096,7 @@ fi
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:3072: checking for iconv" >&5
+echo "configure:3100: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3076,7 +3104,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 3080 "configure"
+#line 3108 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -3086,7 +3114,7 @@ iconv_t cd = iconv_open("","");
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:3090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -3098,7 +3126,7 @@ rm -f conftest*
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 3102 "configure"
+#line 3130 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -3108,7 +3136,7 @@ iconv_t cd = iconv_open("","");
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -3129,13 +3157,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
 EOF
 
     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:3133: checking for iconv declaration" >&5
+echo "configure:3161: checking for iconv declaration" >&5
     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 3139 "configure"
+#line 3167 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3154,7 +3182,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_proto_iconv_arg1=""
 else
@@ -3183,19 +3211,19 @@ EOF
 
    
   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:3187: checking for nl_langinfo and CODESET" >&5
+echo "configure:3215: checking for nl_langinfo and CODESET" >&5
 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3192 "configure"
+#line 3220 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int main() {
 char* cs = nl_langinfo(CODESET);
 ; return 0; }
 EOF
-if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_langinfo_codeset=yes
 else
@@ -3218,19 +3246,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3222: checking for LC_MESSAGES" >&5
+echo "configure:3250: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3227 "configure"
+#line 3255 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -3251,7 +3279,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3255: checking whether NLS is requested" >&5
+echo "configure:3283: checking whether NLS is requested" >&5
         
     
 # Check whether --enable-nls or --disable-nls was given.
@@ -3275,7 +3303,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3279: checking whether included gettext is requested" >&5
+echo "configure:3307: checking whether included gettext is requested" >&5
       
 # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
@@ -3296,17 +3324,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3300: checking for libintl.h" >&5
+echo "configure:3328: checking for libintl.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 3305 "configure"
+#line 3333 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3338: \"$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*
@@ -3323,12 +3351,12 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:3327: checking for GNU gettext in libc" >&5
+echo "configure:3355: checking for GNU gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3332 "configure"
+#line 3360 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -3337,7 +3365,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libc=yes
 else
@@ -3353,14 +3381,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
 
 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:3357: checking for GNU gettext in libintl" >&5
+echo "configure:3385: checking for GNU gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   gt_save_LIBS="$LIBS"
 		LIBS="$LIBS -lintl $LIBICONV"
 		cat > conftest.$ac_ext <<EOF
-#line 3364 "configure"
+#line 3392 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -3369,7 +3397,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libintl=yes
 else
@@ -3402,12 +3430,12 @@ EOF
 	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3406: checking for $ac_func" >&5
+echo "configure:3434: 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 3411 "configure"
+#line 3439 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3430,7 +3458,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3462: \"$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
@@ -3460,7 +3488,7 @@ done
 
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3464: checking for $ac_word" >&5
+echo "configure:3492: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3494,7 +3522,7 @@ fi
 	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3498: checking for $ac_word" >&5
+echo "configure:3526: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3532,7 +3560,7 @@ fi
 
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3536: checking for $ac_word" >&5
+echo "configure:3564: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3583,7 +3611,7 @@ fi
 
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3587: checking for $ac_word" >&5
+echo "configure:3615: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3617,7 +3645,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3621: checking for $ac_word" >&5
+echo "configure:3649: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3654,7 +3682,7 @@ fi
 
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3658: checking for $ac_word" >&5
+echo "configure:3686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3726,7 +3754,7 @@ do
 # 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:3730: checking for $ac_word" >&5
+echo "configure:3758: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3759,7 +3787,7 @@ done
       ac_verc_fail=yes
     else
             echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:3763: checking version of bison" >&5
+echo "configure:3791: checking version of bison" >&5
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -3806,7 +3834,7 @@ echo "configure:3763: checking version of bison" >&5
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3810: checking for catalogs to be installed" >&5
+echo "configure:3838: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
          useit=no
@@ -3854,7 +3882,7 @@ use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
 echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6
-echo "configure:3858: checking if we should use included message-library" >&5
+echo "configure:3886: 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
@@ -3898,17 +3926,17 @@ elif test "$USE_NLS" = yes ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3902: checking for $ac_hdr" >&5
+echo "configure:3930: 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 3907 "configure"
+#line 3935 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3940: \"$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*
@@ -4030,7 +4058,7 @@ eval NLS_DATADIR="$withval"
 
 
 echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6
-echo "configure:4034: checking if you want full utility pathnames" >&5
+echo "configure:4062: 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
@@ -4055,7 +4083,7 @@ EOF
 
 
 echo $ac_n "checking for system mailer""... $ac_c" 1>&6
-echo "configure:4059: checking for system mailer" >&5
+echo "configure:4087: 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
@@ -4082,7 +4110,7 @@ EOF
 
 
 echo $ac_n "checking system mail flags""... $ac_c" 1>&6
-echo "configure:4086: checking system mail flags" >&5
+echo "configure:4114: 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
@@ -4111,13 +4139,13 @@ fi
 
 
 echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:4115: checking if we must define _GNU_SOURCE" >&5
+echo "configure:4143: checking if we must define _GNU_SOURCE" >&5
 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 4121 "configure"
+#line 4149 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -4127,7 +4155,7 @@ make an error
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_gnu_source=no
 else
@@ -4137,7 +4165,7 @@ else
   cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat > conftest.$ac_ext <<EOF
-#line 4141 "configure"
+#line 4169 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -4147,7 +4175,7 @@ make an error
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_gnu_source=no
 else
@@ -4210,14 +4238,14 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat > conftest.$ac_ext <<EOF
-#line 4214 "configure"
+#line 4242 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -4240,7 +4268,7 @@ fi
 ### 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 ssl library""... $ac_c" 1>&6
-echo "configure:4244: checking if you want ssl library" >&5
+echo "configure:4272: checking if you want ssl library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libssl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4261,7 +4289,7 @@ echo "$ac_t""$cf_cv_use_libssl" 1>&6
 
 if test "x$cf_cv_use_libssl" = "xno" ; then
 echo $ac_n "checking if you want experimental gnutls support""... $ac_c" 1>&6
-echo "configure:4265: checking if you want experimental gnutls support" >&5
+echo "configure:4293: checking if you want experimental gnutls support" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libgnutls'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4282,7 +4310,7 @@ echo "$ac_t""$cf_cv_use_libgnutls" 1>&6
 fi
 
 echo $ac_n "checking if you want socks library""... $ac_c" 1>&6
-echo "configure:4286: checking if you want socks library" >&5
+echo "configure:4314: 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
@@ -4302,7 +4330,7 @@ fi
 echo "$ac_t""$cf_cv_use_libsocks" 1>&6
 
 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6
-echo "configure:4306: checking if you want socks5 library" >&5
+echo "configure:4334: 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
@@ -4378,7 +4406,7 @@ cat >> confdefs.h <<\EOF
 EOF
 
 cat > conftest.$ac_ext <<EOF
-#line 4382 "configure"
+#line 4410 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4387,7 +4415,7 @@ int main() {
 	accept((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:4391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -4426,10 +4454,10 @@ cat >> confdefs.h <<\EOF
 EOF
 
 echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6
-echo "configure:4430: checking if the socks library uses socks4 prefix" >&5
+echo "configure:4458: checking if the socks library uses socks4 prefix" >&5
 cf_use_socks4=error
 cat > conftest.$ac_ext <<EOF
-#line 4433 "configure"
+#line 4461 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -4438,7 +4466,7 @@ int main() {
 	Rinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:4442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4470: \"$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
@@ -4450,14 +4478,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 4454 "configure"
+#line 4482 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int main() {
 SOCKSinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_use_socks4=no
 else
@@ -4522,9 +4550,9 @@ EOF
 
 fi
 echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6
-echo "configure:4526: checking if socks5p.h is available" >&5
+echo "configure:4554: checking if socks5p.h is available" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4528 "configure"
+#line 4556 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -4534,7 +4562,7 @@ int main() {
 	init((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:4538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_use_socks5p_h=yes
 else
@@ -4554,7 +4582,7 @@ else
 	
 cf_test_netlibs=no
 echo $ac_n "checking for network libraries""... $ac_c" 1>&6
-echo "configure:4558: checking for network libraries" >&5
+echo "configure:4586: checking for network libraries" >&5
 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4565,12 +4593,12 @@ cf_test_netlibs=yes
 for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4569: checking for $ac_func" >&5
+echo "configure:4597: 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 4574 "configure"
+#line 4602 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4593,7 +4621,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4625: \"$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
@@ -4616,7 +4644,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:4620: checking for gethostname in -lnsl" >&5
+echo "configure:4648: 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
@@ -4624,7 +4652,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4628 "configure"
+#line 4656 "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
@@ -4635,7 +4663,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:4639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4667: \"$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
@@ -4668,7 +4696,7 @@ else
 	
 		
 echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6
-echo "configure:4672: checking for gethostname in -lsocket" >&5
+echo "configure:4700: 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
@@ -4676,7 +4704,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4680 "configure"
+#line 4708 "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
@@ -4687,7 +4715,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:4691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4719: \"$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
@@ -4732,7 +4760,7 @@ done
 # I don't know the entrypoints - 97/7/22 TD
 # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs")
 echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
-echo "configure:4736: checking for main in -linet" >&5
+echo "configure:4764: checking for main in -linet" >&5
 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4740,14 +4768,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4744 "configure"
+#line 4772 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4779: \"$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
@@ -4772,12 +4800,12 @@ if test "$ac_cv_func_lsocket" != no ; then
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4776: checking for $ac_func" >&5
+echo "configure:4804: 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 4781 "configure"
+#line 4809 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4800,7 +4828,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4832: \"$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
@@ -4823,7 +4851,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:4827: checking for socket in -lsocket" >&5
+echo "configure:4855: 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
@@ -4831,7 +4859,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4835 "configure"
+#line 4863 "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
@@ -4842,7 +4870,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4874: \"$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
@@ -4875,7 +4903,7 @@ else
 	
 		
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:4879: checking for socket in -lbsd" >&5
+echo "configure:4907: 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
@@ -4883,7 +4911,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4887 "configure"
+#line 4915 "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
@@ -4894,7 +4922,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:4898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4926: \"$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
@@ -4939,12 +4967,12 @@ fi
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4943: checking for $ac_func" >&5
+echo "configure:4971: 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 4948 "configure"
+#line 4976 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4967,7 +4995,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4999: \"$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
@@ -4990,7 +5018,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4994: checking for gethostbyname in -lnsl" >&5
+echo "configure:5022: 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
@@ -4998,7 +5026,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5002 "configure"
+#line 5030 "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
@@ -5009,7 +5037,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5041: \"$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
@@ -5050,12 +5078,12 @@ done
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5054: checking for $ac_func" >&5
+echo "configure:5082: 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 5059 "configure"
+#line 5087 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5078,7 +5106,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5110: \"$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
@@ -5101,7 +5129,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
-echo "configure:5105: checking for strcasecmp in -lresolv" >&5
+echo "configure:5133: 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
@@ -5109,7 +5137,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5113 "configure"
+#line 5141 "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
@@ -5120,7 +5148,7 @@ int main() {
 strcasecmp()
 ; return 0; }
 EOF
-if { (eval echo configure:5124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5152: \"$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
@@ -5166,13 +5194,13 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 fi
 
 echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6
-echo "configure:5170: checking for inet_aton function" >&5
+echo "configure:5198: 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 5176 "configure"
+#line 5204 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -5183,7 +5211,7 @@ int main() {
 inet_aton(0, (struct in_addr *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5215: \"$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
@@ -5203,13 +5231,13 @@ EOF
 
 else
     echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6
-echo "configure:5207: checking for inet_addr function" >&5
+echo "configure:5235: 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 5213 "configure"
+#line 5241 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -5220,7 +5248,7 @@ int main() {
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:5224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5252: \"$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
@@ -5235,7 +5263,7 @@ fi
 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:5239: checking for library with inet_addr" >&5
+echo "configure:5267: 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
@@ -5245,7 +5273,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat > conftest.$ac_ext <<EOF
-#line 5249 "configure"
+#line 5277 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -5256,7 +5284,7 @@ int main() {
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5288: \"$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
@@ -5289,7 +5317,7 @@ no) #(vi
   ;;
 yes) #(vi
   echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6
-echo "configure:5293: checking for SSL_get_version in -lssl" >&5
+echo "configure:5321: checking for SSL_get_version in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5297,7 +5325,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lssl -lcrypto $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5301 "configure"
+#line 5329 "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
@@ -5308,7 +5336,7 @@ int main() {
 SSL_get_version()
 ; return 0; }
 EOF
-if { (eval echo configure:5312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5340: \"$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
@@ -5363,9 +5391,9 @@ esac
 LIBS="$cf_ssl_library $LIBS"
 
 echo $ac_n "checking for openssl include directory""... $ac_c" 1>&6
-echo "configure:5367: checking for openssl include directory" >&5
+echo "configure:5395: checking for openssl include directory" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5369 "configure"
+#line 5397 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5374,7 +5402,7 @@ int main() {
 SSL_shutdown((SSL *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_openssl_incl=yes
 else
@@ -5391,9 +5419,9 @@ EOF
 
 
 echo $ac_n "checking if we can link to ssl library""... $ac_c" 1>&6
-echo "configure:5395: checking if we can link to ssl library" >&5
+echo "configure:5423: checking if we can link to ssl library" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5397 "configure"
+#line 5425 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5407,7 +5435,7 @@ int main() {
 SSL_shutdown((SSL *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_ssl_library=yes
 else
@@ -5435,7 +5463,7 @@ no) #(vi
   ;;
 yes) #(vi
   echo $ac_n "checking for SSL_get_version in -lgnutls""... $ac_c" 1>&6
-echo "configure:5439: checking for SSL_get_version in -lgnutls" >&5
+echo "configure:5467: checking for SSL_get_version in -lgnutls" >&5
 ac_lib_var=`echo gnutls'_'SSL_get_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5443,7 +5471,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgnutls -lcrypt $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5447 "configure"
+#line 5475 "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
@@ -5454,7 +5482,7 @@ int main() {
 SSL_get_version()
 ; return 0; }
 EOF
-if { (eval echo configure:5458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5486: \"$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
@@ -5509,9 +5537,9 @@ esac
 LIBS="$cf_ssl_library $LIBS"
 
 echo $ac_n "checking for gnutls include directory""... $ac_c" 1>&6
-echo "configure:5513: checking for gnutls include directory" >&5
+echo "configure:5541: checking for gnutls include directory" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5515 "configure"
+#line 5543 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5520,7 +5548,7 @@ int main() {
 SSL_shutdown((SSL *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_openssl_incl=yes
 else
@@ -5537,9 +5565,9 @@ EOF
 
 
 echo $ac_n "checking if we can link to gnutls library""... $ac_c" 1>&6
-echo "configure:5541: checking if we can link to gnutls library" >&5
+echo "configure:5569: checking if we can link to gnutls library" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5543 "configure"
+#line 5571 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5553,7 +5581,7 @@ int main() {
 SSL_shutdown((SSL *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_ssl_library=yes
 else
@@ -5576,7 +5604,7 @@ fi
 fi
 
 echo $ac_n "checking for screen type""... $ac_c" 1>&6
-echo "configure:5580: checking for screen type" >&5
+echo "configure:5608: checking for screen type" >&5
 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5646,7 +5674,7 @@ curses)
 	
 
 echo $ac_n "checking for extra include directories""... $ac_c" 1>&6
-echo "configure:5650: checking for extra include directories" >&5
+echo "configure:5678: checking for extra include directories" >&5
 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5670,7 +5698,7 @@ echo "$ac_t""$cf_cv_curses_incdir" 1>&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
 echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6
-echo "configure:5674: checking if we have identified curses headers" >&5
+echo "configure:5702: checking if we have identified curses headers" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5683,14 +5711,14 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat > conftest.$ac_ext <<EOF
-#line 5687 "configure"
+#line 5715 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int main() {
 initscr(); tgoto("?", 0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:5694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -5713,17 +5741,17 @@ for ac_hdr in $cf_cv_ncurses_header
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5717: checking for $ac_hdr" >&5
+echo "configure:5745: 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 5722 "configure"
+#line 5750 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5755: \"$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*
@@ -5753,7 +5781,7 @@ done
 
 	
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:5757: checking for ncurses version" >&5
+echo "configure:5785: 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
@@ -5779,7 +5807,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:5783: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:5811: \"$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"
@@ -5788,7 +5816,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 5792 "configure"
+#line 5820 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -5812,7 +5840,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:5816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5844: \"$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`
@@ -5836,16 +5864,16 @@ EOF
 	
 
 echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6
-echo "configure:5840: checking if we have identified curses libraries" >&5
+echo "configure:5868: checking if we have identified curses libraries" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5842 "configure"
+#line 5870 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); tgoto("?", 0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:5849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -5861,7 +5889,7 @@ if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:5865: checking for tgoto in -lmytinfo" >&5
+echo "configure:5893: 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
@@ -5869,7 +5897,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5873 "configure"
+#line 5901 "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
@@ -5880,7 +5908,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5912: \"$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
@@ -5903,7 +5931,7 @@ fi
 	;;
 hpux10.*|hpux11.*) #(vi
 	echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-echo "configure:5907: checking for initscr in -lcur_colr" >&5
+echo "configure:5935: 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
@@ -5911,7 +5939,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcur_colr  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5915 "configure"
+#line 5943 "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
@@ -5922,7 +5950,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5954: \"$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
@@ -5945,7 +5973,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-echo "configure:5949: checking for initscr in -lHcurses" >&5
+echo "configure:5977: 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
@@ -5953,7 +5981,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lHcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5957 "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
@@ -5964,7 +5992,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5968: \"$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
@@ -6017,12 +6045,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# 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:6021: checking for tgoto" >&5
+echo "configure:6049: 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 6026 "configure"
+#line 6054 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto(); below.  */
@@ -6045,7 +6073,7 @@ tgoto();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6077: \"$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
@@ -6066,7 +6094,7 @@ else
 		for cf_term_lib in $cf_check_list termcap termlib unknown
 		do
 			echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-echo "configure:6070: checking for tgoto in -l$cf_term_lib" >&5
+echo "configure:6098: 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
@@ -6074,7 +6102,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_term_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6078 "configure"
+#line 6106 "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
@@ -6085,7 +6113,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6117: \"$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
@@ -6115,7 +6143,7 @@ fi
 	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
 	do
 		echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-echo "configure:6119: checking for initscr in -l$cf_curs_lib" >&5
+echo "configure:6147: 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
@@ -6123,7 +6151,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_curs_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6127 "configure"
+#line 6155 "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
@@ -6134,7 +6162,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6166: \"$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
@@ -6160,16 +6188,16 @@ fi
 	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:6164: checking if we can link with $cf_curs_lib library" >&5
+echo "configure:6192: checking if we can link with $cf_curs_lib library" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6166 "configure"
+#line 6194 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; 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:6201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6185,16 +6213,16 @@ rm -f conftest*
 		:
 	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:6189: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+echo "configure:6217: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6191 "configure"
+#line 6219 "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:6198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=no
 else
@@ -6204,14 +6232,14 @@ else
   
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 6208 "configure"
+#line 6236 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; 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:6243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6232,14 +6260,14 @@ fi
 
 	
 echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6
-echo "configure:6236: checking for curses performance tradeoff" >&5
+echo "configure:6264: 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 6243 "configure"
+#line 6271 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6253,11 +6281,11 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 6261 "configure"
+#line 6289 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -6272,7 +6300,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_curs_performance=yes
 else
@@ -6295,13 +6323,13 @@ EOF
 
 	
 echo $ac_n "checking for curses touchline function""... $ac_c" 1>&6
-echo "configure:6299: checking for curses touchline function" >&5
+echo "configure:6327: checking for curses touchline function" >&5
 if eval "test \"`echo '$''{'cf_cv_curs_touchline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 6305 "configure"
+#line 6333 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6309,7 +6337,7 @@ int main() {
 touchline(stdscr, 1,2,3);
 ; return 0; }
 EOF
-if { (eval echo configure:6313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_curs_touchline=bsd
 else
@@ -6317,7 +6345,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 6321 "configure"
+#line 6349 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6325,7 +6353,7 @@ int main() {
 touchline(stdscr, 1,2);
 ; return 0; }
 EOF
-if { (eval echo configure:6329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_curs_touchline=sysv
 else
@@ -6366,7 +6394,7 @@ test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
-echo "configure:6370: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "configure:6398: checking for $cf_ncuhdr_root header in include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6377,7 +6405,7 @@ else
 	do
 		
 	cat > conftest.$ac_ext <<EOF
-#line 6381 "configure"
+#line 6409 "configure"
 #include "confdefs.h"
 
 
@@ -6398,7 +6426,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h=$cf_header
 	
@@ -6421,7 +6449,7 @@ if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
-echo "configure:6425: checking for $cf_ncuhdr_root include-path" >&5
+echo "configure:6453: checking for $cf_ncuhdr_root include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6516,14 +6544,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 6520 "configure"
+#line 6548 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:6527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -6550,7 +6578,7 @@ done
 		do
 			
 	cat > conftest.$ac_ext <<EOF
-#line 6554 "configure"
+#line 6582 "configure"
 #include "confdefs.h"
 
 
@@ -6571,7 +6599,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:6575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h2=$cf_header
 	
@@ -6618,14 +6646,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 6622 "configure"
+#line 6650 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:6629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -6680,7 +6708,7 @@ esac
 
 
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:6684: checking for ncurses version" >&5
+echo "configure:6712: 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
@@ -6706,7 +6734,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:6710: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:6738: \"$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"
@@ -6715,7 +6743,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 6719 "configure"
+#line 6747 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6739,7 +6767,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:6743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6771: \"$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`
@@ -6770,7 +6798,7 @@ cf_nculib_root=ncurses
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:6774: checking for Gpm_Open in -lgpm" >&5
+echo "configure:6802: 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
@@ -6778,7 +6806,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6782 "configure"
+#line 6810 "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
@@ -6789,7 +6817,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6821: \"$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
@@ -6805,7 +6833,7 @@ fi
 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:6809: checking for initscr in -lgpm" >&5
+echo "configure:6837: 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
@@ -6813,7 +6841,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6817 "configure"
+#line 6845 "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
@@ -6824,7 +6852,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6856: \"$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
@@ -6855,7 +6883,7 @@ freebsd*)
 	# 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:6859: checking for tgoto in -lmytinfo" >&5
+echo "configure:6887: 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
@@ -6863,7 +6891,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6867 "configure"
+#line 6895 "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
@@ -6874,7 +6902,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6906: \"$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
@@ -6907,12 +6935,12 @@ else
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:6911: checking for initscr" >&5
+echo "configure:6939: 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 6916 "configure"
+#line 6944 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -6935,7 +6963,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6967: \"$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
@@ -6955,17 +6983,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
-echo "configure:6959: checking for initscr in -l$cf_nculib_root" >&5
+echo "configure:6987: checking for initscr in -l$cf_nculib_root" >&5
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 6962 "configure"
+#line 6990 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -7034,17 +7062,17 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
-echo "configure:7038: checking for -l$cf_nculib_root in $cf_libdir" >&5
+echo "configure:7066: checking for -l$cf_nculib_root in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 7041 "configure"
+#line 7069 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -7075,7 +7103,7 @@ fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:7079: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+echo "configure:7107: checking if we can link $cf_nculib_root 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$%%"`
@@ -7084,14 +7112,14 @@ echo "configure:7079: checking if we can link $cf_nculib_root without $cf_ncurse
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 7088 "configure"
+#line 7116 "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:7095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7123: \"$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
@@ -7114,7 +7142,7 @@ EOF
 
 	
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:7118: checking for ncurses version" >&5
+echo "configure:7146: 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
@@ -7140,7 +7168,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:7144: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:7172: \"$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"
@@ -7149,7 +7177,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 7153 "configure"
+#line 7181 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7173,7 +7201,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7205: \"$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`
@@ -7198,14 +7226,14 @@ EOF
 ncursesw)
 	
 echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6
-echo "configure:7202: checking for multibyte character support" >&5
+echo "configure:7230: checking for multibyte character support" >&5
 if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cf_save_LIBS="$LIBS"
 	cat > conftest.$ac_ext <<EOF
-#line 7209 "configure"
+#line 7237 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7213,7 +7241,7 @@ int main() {
 putwc(0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:7217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_utf8_lib=yes
 else
@@ -7222,7 +7250,7 @@ else
   rm -rf conftest*
   LIBS="-lutf8 $LIBS"
 	 cat > conftest.$ac_ext <<EOF
-#line 7226 "configure"
+#line 7254 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7230,7 +7258,7 @@ int main() {
 putwc(0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:7234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_utf8_lib=add-on
 else
@@ -7267,7 +7295,7 @@ test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
-echo "configure:7271: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "configure:7299: checking for $cf_ncuhdr_root header in include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7278,7 +7306,7 @@ else
 	do
 		
 	cat > conftest.$ac_ext <<EOF
-#line 7282 "configure"
+#line 7310 "configure"
 #include "confdefs.h"
 
 
@@ -7307,7 +7335,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:7311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h=$cf_header
 	
@@ -7330,7 +7358,7 @@ if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
-echo "configure:7334: checking for $cf_ncuhdr_root include-path" >&5
+echo "configure:7362: checking for $cf_ncuhdr_root include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7425,14 +7453,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 7429 "configure"
+#line 7457 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:7436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -7459,7 +7487,7 @@ done
 		do
 			
 	cat > conftest.$ac_ext <<EOF
-#line 7463 "configure"
+#line 7491 "configure"
 #include "confdefs.h"
 
 
@@ -7488,7 +7516,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:7492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h2=$cf_header
 	
@@ -7535,14 +7563,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 7539 "configure"
+#line 7567 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:7546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -7597,7 +7625,7 @@ esac
 
 
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:7601: checking for ncurses version" >&5
+echo "configure:7629: 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
@@ -7623,7 +7651,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:7627: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:7655: \"$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"
@@ -7632,7 +7660,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 7636 "configure"
+#line 7664 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7656,7 +7684,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:7660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7688: \"$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`
@@ -7687,7 +7715,7 @@ cf_nculib_root=ncursesw
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:7691: checking for Gpm_Open in -lgpm" >&5
+echo "configure:7719: 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
@@ -7695,7 +7723,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7699 "configure"
+#line 7727 "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
@@ -7706,7 +7734,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:7710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7738: \"$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
@@ -7722,7 +7750,7 @@ fi
 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:7726: checking for initscr in -lgpm" >&5
+echo "configure:7754: 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
@@ -7730,7 +7758,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7734 "configure"
+#line 7762 "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
@@ -7741,7 +7769,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7773: \"$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
@@ -7772,7 +7800,7 @@ freebsd*)
 	# 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:7776: checking for tgoto in -lmytinfo" >&5
+echo "configure:7804: 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
@@ -7780,7 +7808,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7784 "configure"
+#line 7812 "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
@@ -7791,7 +7819,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7823: \"$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
@@ -7824,12 +7852,12 @@ else
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:7828: checking for initscr" >&5
+echo "configure:7856: 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 7833 "configure"
+#line 7861 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -7852,7 +7880,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7884: \"$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
@@ -7872,17 +7900,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
-echo "configure:7876: checking for initscr in -l$cf_nculib_root" >&5
+echo "configure:7904: checking for initscr in -l$cf_nculib_root" >&5
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 7879 "configure"
+#line 7907 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -7951,17 +7979,17 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
-echo "configure:7955: checking for -l$cf_nculib_root in $cf_libdir" >&5
+echo "configure:7983: checking for -l$cf_nculib_root in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 7958 "configure"
+#line 7986 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -7992,7 +8020,7 @@ fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:7996: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+echo "configure:8024: checking if we can link $cf_nculib_root 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$%%"`
@@ -8001,14 +8029,14 @@ echo "configure:7996: checking if we can link $cf_nculib_root without $cf_ncurse
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 8005 "configure"
+#line 8033 "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:8012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8040: \"$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
@@ -8031,7 +8059,7 @@ EOF
 
 	
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:8035: checking for ncurses version" >&5
+echo "configure:8063: 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
@@ -8057,7 +8085,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:8061: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:8089: \"$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"
@@ -8066,7 +8094,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8070 "configure"
+#line 8098 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8090,7 +8118,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:8094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8122: \"$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`
@@ -8119,20 +8147,20 @@ pdcurses)
 slang)
 	
 echo $ac_n "checking for slang header file""... $ac_c" 1>&6
-echo "configure:8123: checking for slang header file" >&5
+echo "configure:8151: 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 8129 "configure"
+#line 8157 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 printf("%s\n", SLANG_VERSION)
 ; return 0; }
 EOF
-if { (eval echo configure:8136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_slang_header=predefined
 else
@@ -8256,14 +8284,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 8260 "configure"
+#line 8288 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:8267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -8296,24 +8324,24 @@ else
   
 cf_cv_termlib=none
 cat > conftest.$ac_ext <<EOF
-#line 8300 "configure"
+#line 8328 "configure"
 #include "confdefs.h"
 
 int main() {
 char *x=(char*)tgoto("",0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:8307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 8310 "configure"
+#line 8338 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=tigetstr("")
 ; return 0; }
 EOF
-if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_termlib=terminfo
 else
@@ -8342,16 +8370,16 @@ if test "$cf_cv_termlib" = none; then
 	for cf_func in tigetstr tgetstr
 	do
 		echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6
-echo "configure:8346: checking for $cf_func in -l$cf_lib" >&5
+echo "configure:8374: checking for $cf_func in -l$cf_lib" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 8348 "configure"
+#line 8376 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=$cf_func("")
 ; return 0; }
 EOF
-if { (eval echo configure:8355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -8378,7 +8406,7 @@ fi
 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:8382: checking for initscr in -lcurses" >&5
+echo "configure:8410: 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
@@ -8386,7 +8414,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8390 "configure"
+#line 8418 "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
@@ -8397,7 +8425,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:8401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8429: \"$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
@@ -8418,7 +8446,7 @@ else
 fi
 
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:8422: checking for tgoto in -ltermcap" >&5
+echo "configure:8450: 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
@@ -8426,7 +8454,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8430 "configure"
+#line 8458 "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
@@ -8437,7 +8465,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:8441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8469: \"$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
@@ -8469,12 +8497,12 @@ fi
 
 cf_slang_LIBS2="$LIBS"
 echo $ac_n "checking for acos""... $ac_c" 1>&6
-echo "configure:8473: checking for acos" >&5
+echo "configure:8501: 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 8478 "configure"
+#line 8506 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos(); below.  */
@@ -8497,7 +8525,7 @@ acos();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8529: \"$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
@@ -8516,7 +8544,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
-echo "configure:8520: checking for acos in -lm" >&5
+echo "configure:8548: 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
@@ -8524,7 +8552,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8528 "configure"
+#line 8556 "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
@@ -8535,7 +8563,7 @@ int main() {
 acos()
 ; return 0; }
 EOF
-if { (eval echo configure:8539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8567: \"$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
@@ -8577,12 +8605,12 @@ os2*)
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
 	echo $ac_n "checking for v_init""... $ac_c" 1>&6
-echo "configure:8581: checking for v_init" >&5
+echo "configure:8609: checking for v_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_v_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8586 "configure"
+#line 8614 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init(); below.  */
@@ -8605,7 +8633,7 @@ v_init();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_v_init=yes"
 else
@@ -8625,17 +8653,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for v_init in -lvideo""... $ac_c" 1>&6
-echo "configure:8629: checking for v_init in -lvideo" >&5
+echo "configure:8657: checking for v_init in -lvideo" >&5
 		LIBS="-lvideo $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 8632 "configure"
+#line 8660 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int main() {
 v_init()
 ; return 0; }
 EOF
-if { (eval echo configure:8639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'video'=yes'
@@ -8704,17 +8732,17 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lvideo in $cf_libdir""... $ac_c" 1>&6
-echo "configure:8708: checking for -lvideo in $cf_libdir" >&5
+echo "configure:8736: checking for -lvideo in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 8711 "configure"
+#line 8739 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int main() {
 v_init()
 ; return 0; }
 EOF
-if { (eval echo configure:8718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
@@ -8747,12 +8775,12 @@ esac
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
 	echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6
-echo "configure:8751: checking for SLtt_get_screen_size" >&5
+echo "configure:8779: 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 8756 "configure"
+#line 8784 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size(); below.  */
@@ -8775,7 +8803,7 @@ SLtt_get_screen_size();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8807: \"$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
@@ -8795,17 +8823,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:8799: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:8827: checking for SLtt_get_screen_size in -lslang" >&5
 		LIBS="-lslang $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 8802 "configure"
+#line 8830 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
@@ -8874,17 +8902,17 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6
-echo "configure:8878: checking for -lslang in $cf_libdir" >&5
+echo "configure:8906: checking for -lslang in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 8881 "configure"
+#line 8909 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
@@ -8913,7 +8941,7 @@ fi
 
 cf_slang_LIBS3="$LIBS"
 echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6
-echo "configure:8917: checking if we can link slang without termcap" >&5
+echo "configure:8945: 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
@@ -8921,14 +8949,14 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat > conftest.$ac_ext <<EOF
-#line 8925 "configure"
+#line 8953 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -8945,13 +8973,13 @@ test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 
 echo $ac_n "checking if we must tell slang this is UNIX""... $ac_c" 1>&6
-echo "configure:8949: checking if we must tell slang this is UNIX" >&5
+echo "configure:8977: checking if we must tell slang this is UNIX" >&5
 if eval "test \"`echo '$''{'cf_cv_slang_unix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 8955 "configure"
+#line 8983 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
@@ -8965,7 +8993,7 @@ SLang_TT_Baud_Rate = 1
 
 ; return 0; }
 EOF
-if { (eval echo configure:8969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_slang_unix=yes
 else
@@ -8991,7 +9019,7 @@ eval cf_libdir=$libdir
 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:8995: checking for location of config-file" >&5
+echo "configure:9023: 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"
@@ -9003,7 +9031,7 @@ CHARSET_DEFS=
 
 
 echo $ac_n "checking if you want only a few charsets""... $ac_c" 1>&6
-echo "configure:9007: checking if you want only a few charsets" >&5
+echo "configure:9035: checking if you want only a few charsets" >&5
 
 # Check whether --with-charsets or --without-charsets was given.
 if test "${with_charsets+set}" = set; then
@@ -9064,12 +9092,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:9068: checking for ANSI C header files" >&5
+echo "configure:9096: 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 9073 "configure"
+#line 9101 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9077,7 +9105,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9109: \"$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*
@@ -9094,7 +9122,7 @@ rm -f conftest*
 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 9098 "configure"
+#line 9126 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -9112,7 +9140,7 @@ fi
 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 9116 "configure"
+#line 9144 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -9133,7 +9161,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 9137 "configure"
+#line 9165 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -9144,7 +9172,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:9148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9168,12 +9196,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:9172: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:9200: 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 9177 "configure"
+#line 9205 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -9182,7 +9210,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:9186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -9207,12 +9235,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 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:9211: checking for $ac_hdr that defines DIR" >&5
+echo "configure:9239: 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 9216 "configure"
+#line 9244 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -9220,7 +9248,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:9224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -9245,7 +9273,7 @@ done
 # 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:9249: checking for opendir in -ldir" >&5
+echo "configure:9277: 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
@@ -9253,7 +9281,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9257 "configure"
+#line 9285 "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
@@ -9264,7 +9292,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:9268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9296: \"$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
@@ -9286,7 +9314,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:9290: checking for opendir in -lx" >&5
+echo "configure:9318: 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
@@ -9294,7 +9322,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9298 "configure"
+#line 9326 "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
@@ -9305,7 +9333,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:9309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9337: \"$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
@@ -9348,17 +9376,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9352: checking for $ac_hdr" >&5
+echo "configure:9380: 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 9357 "configure"
+#line 9385 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9390: \"$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*
@@ -9386,13 +9414,13 @@ done
 
 
 echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6
-echo "configure:9390: checking termio.h and termios.h" >&5
+echo "configure:9418: 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 9396 "configure"
+#line 9424 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -9405,7 +9433,7 @@ int main() {
 putchar (0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:9409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_termios=yes
 else
@@ -9425,13 +9453,13 @@ EOF
 
 
 echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6
-echo "configure:9429: checking for sigaction and structs" >&5
+echo "configure:9457: checking for sigaction and structs" >&5
 if eval "test \"`echo '$''{'cf_cv_func_sigaction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9435 "configure"
+#line 9463 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9446,7 +9474,7 @@ struct sigaction act;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_func_sigaction=yes
 else
@@ -9470,17 +9498,17 @@ for ac_hdr in sys/wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9474: checking for $ac_hdr" >&5
+echo "configure:9502: 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 9479 "configure"
+#line 9507 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9512: \"$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*
@@ -9517,17 +9545,17 @@ for ac_hdr in wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9521: checking for $ac_hdr" >&5
+echo "configure:9549: 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 9526 "configure"
+#line 9554 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9559: \"$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*
@@ -9557,17 +9585,17 @@ for ac_hdr in waitstatus.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9561: checking for $ac_hdr" >&5
+echo "configure:9589: 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 9566 "configure"
+#line 9594 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9599: \"$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*
@@ -9608,13 +9636,13 @@ fi
 
 
 echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:9612: checking for union wait" >&5
+echo "configure:9640: 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 9618 "configure"
+#line 9646 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -9625,7 +9653,7 @@ int x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9657: \"$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
@@ -9636,7 +9664,7 @@ else
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 9640 "configure"
+#line 9668 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -9651,7 +9679,7 @@ union wait x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9683: \"$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
@@ -9678,20 +9706,20 @@ EOF
 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:9682: checking if union wait can be used as wait-arg" >&5
+echo "configure:9710: 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 9688 "configure"
+#line 9716 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; wait(&x)
 ; return 0; }
 EOF
-if { (eval echo configure:9695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_wait=yes
 else
@@ -9711,20 +9739,20 @@ EOF
 
 
 	echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6
-echo "configure:9715: checking if union wait can be used as waitpid-arg" >&5
+echo "configure:9743: 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 9721 "configure"
+#line 9749 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; waitpid(0, &x, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:9728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_waitpid=yes
 else
@@ -9750,17 +9778,17 @@ for ac_hdr in stdarg.h varargs.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9754: checking for $ac_hdr" >&5
+echo "configure:9782: 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 9759 "configure"
+#line 9787 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9792: \"$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*
@@ -9787,13 +9815,13 @@ fi
 done
 
 echo $ac_n "checking for standard varargs""... $ac_c" 1>&6
-echo "configure:9791: checking for standard varargs" >&5
+echo "configure:9819: 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 9797 "configure"
+#line 9825 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -9808,7 +9836,7 @@ int main() {
 return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 ; return 0; }
 EOF
-if { (eval echo configure:9812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_varargs=yes
 else
@@ -9828,12 +9856,12 @@ EOF
 
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9832: checking for uid_t in sys/types.h" >&5
+echo "configure:9860: 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 9837 "configure"
+#line 9865 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -9862,7 +9890,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:9866: checking type of array argument to getgroups" >&5
+echo "configure:9894: 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
@@ -9870,7 +9898,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 9874 "configure"
+#line 9902 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -9895,7 +9923,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:9899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9927: \"$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
@@ -9909,7 +9937,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 9913 "configure"
+#line 9941 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -9933,12 +9961,12 @@ EOF
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:9937: checking for pid_t" >&5
+echo "configure:9965: 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 9942 "configure"
+#line 9970 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9966,12 +9994,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9970: checking for uid_t in sys/types.h" >&5
+echo "configure:9998: 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 9975 "configure"
+#line 10003 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -10000,12 +10028,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:10004: checking for mode_t" >&5
+echo "configure:10032: 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 10009 "configure"
+#line 10037 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -10037,19 +10065,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:10041: checking for working alloca.h" >&5
+echo "configure:10069: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10046 "configure"
+#line 10074 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:10053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -10070,12 +10098,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:10074: checking for alloca" >&5
+echo "configure:10102: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10079 "configure"
+#line 10107 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -10103,7 +10131,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:10107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -10135,12 +10163,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:10139: checking whether alloca needs Cray hooks" >&5
+echo "configure:10167: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10144 "configure"
+#line 10172 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -10165,12 +10193,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10169: checking for $ac_func" >&5
+echo "configure:10197: 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 10174 "configure"
+#line 10202 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10193,7 +10221,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10225: \"$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
@@ -10220,7 +10248,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:10224: checking stack direction for C alloca" >&5
+echo "configure:10252: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10228,7 +10256,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 10232 "configure"
+#line 10260 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -10247,7 +10275,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -10270,17 +10298,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:10274: checking for vfork.h" >&5
+echo "configure:10302: 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 10279 "configure"
+#line 10307 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10312: \"$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*
@@ -10305,18 +10333,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:10309: checking for working vfork" >&5
+echo "configure:10337: 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:10315: checking for vfork" >&5
+echo "configure:10343: 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 10320 "configure"
+#line 10348 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -10339,7 +10367,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10371: \"$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
@@ -10361,7 +10389,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 10365 "configure"
+#line 10393 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -10456,7 +10484,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10488: \"$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
@@ -10480,13 +10508,13 @@ fi
 
 
 echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6
-echo "configure:10484: checking if we should use fcntl or ioctl" >&5
+echo "configure:10512: 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 10490 "configure"
+#line 10518 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10498,7 +10526,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=ioctl
 else
@@ -10507,7 +10535,7 @@ else
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 10511 "configure"
+#line 10539 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10524,7 +10552,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=fcntl
 else
@@ -10547,20 +10575,20 @@ EOF
 
 
 echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6
-echo "configure:10551: checking for broken/missing definition of remove" >&5
+echo "configure:10579: 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 10557 "configure"
+#line 10585 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=no
 else
@@ -10568,7 +10596,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10572 "configure"
+#line 10600 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); } 
@@ -10576,7 +10604,7 @@ int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:10580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=yes
 else
@@ -10600,13 +10628,13 @@ EOF
 
 
 echo $ac_n "checking for lstat""... $ac_c" 1>&6
-echo "configure:10604: checking for lstat" >&5
+echo "configure:10632: 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 10610 "configure"
+#line 10638 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10615,7 +10643,7 @@ int main() {
 lstat(".", (struct stat *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:10619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_lstat=yes
 else
@@ -10658,12 +10686,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10662: checking for $ac_func" >&5
+echo "configure:10690: 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 10667 "configure"
+#line 10695 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10686,7 +10714,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10718: \"$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
@@ -10716,12 +10744,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10720: checking for $ac_func" >&5
+echo "configure:10748: 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 10725 "configure"
+#line 10753 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10744,7 +10772,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10776: \"$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
@@ -10773,7 +10801,7 @@ done
 
 
 echo $ac_n "checking for random-integer functions""... $ac_c" 1>&6
-echo "configure:10777: checking for random-integer functions" >&5
+echo "configure:10805: checking for random-integer functions" >&5
 if eval "test \"`echo '$''{'cf_cv_srand_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10784,7 +10812,7 @@ do
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
 	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
 cat > conftest.$ac_ext <<EOF
-#line 10788 "configure"
+#line 10816 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10798,7 +10826,7 @@ int main() {
 long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 ; return 0; }
 EOF
-if { (eval echo configure:10802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_srand_func=$cf_func
  break
@@ -10814,7 +10842,7 @@ fi
 echo "$ac_t""$cf_cv_srand_func" 1>&6
 if test "$cf_cv_srand_func" != unknown ; then
 	echo $ac_n "checking for range of random-integers""... $ac_c" 1>&6
-echo "configure:10818: checking for range of random-integers" >&5
+echo "configure:10846: checking for range of random-integers" >&5
 if eval "test \"`echo '$''{'cf_cv_rand_max'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10830,7 +10858,7 @@ else
 			;;
 		esac
 		cat > conftest.$ac_ext <<EOF
-#line 10834 "configure"
+#line 10862 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10844,7 +10872,7 @@ int main() {
 long x = $cf_cv_rand_max
 ; return 0; }
 EOF
-if { (eval echo configure:10848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -10880,12 +10908,12 @@ for ac_func in strstr
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:10884: checking for $ac_func declaration" >&5
+echo "configure:10912: 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 10889 "configure"
+#line 10917 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -10894,11 +10922,11 @@ extern	int	${ac_func}();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 10902 "configure"
+#line 10930 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -10907,7 +10935,7 @@ int	(*p)() = ${ac_func};
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -10949,12 +10977,12 @@ for ac_func in getgrgid getgrnam
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:10953: checking for $ac_func declaration" >&5
+echo "configure:10981: 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 10958 "configure"
+#line 10986 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10965,11 +10993,11 @@ extern	int	${ac_func}();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 10973 "configure"
+#line 11001 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10980,7 +11008,7 @@ int	(*p)() = ${ac_func};
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -11022,13 +11050,13 @@ done
 
 
 echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6
-echo "configure:11026: checking if TRUE/FALSE are defined" >&5
+echo "configure:11054: 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 11032 "configure"
+#line 11060 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11037,7 +11065,7 @@ int main() {
 int x = TRUE, y = FALSE
 ; return 0; }
 EOF
-if { (eval echo configure:11041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_bool_defs=yes
 else
@@ -11064,13 +11092,13 @@ fi
 
 
 echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:11068: checking if external errno is declared" >&5
+echo "configure:11096: checking if external errno is declared" >&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 11074 "configure"
+#line 11102 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -11083,7 +11111,7 @@ int main() {
 long x = (long) errno
 ; return 0; }
 EOF
-if { (eval echo configure:11087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_errno=yes
 else
@@ -11111,13 +11139,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:11115: checking if external errno exists" >&5
+echo "configure:11143: checking if external errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11121 "configure"
+#line 11149 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -11127,7 +11155,7 @@ int main() {
 errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:11131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_errno=yes
 else
@@ -11157,21 +11185,21 @@ fi
 
 
 echo $ac_n "checking if we can set errno""... $ac_c" 1>&6
-echo "configure:11161: checking if we can set errno" >&5
+echo "configure:11189: checking if we can set errno" >&5
 if eval "test \"`echo '$''{'cf_cv_set_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 if test "$cross_compiling" = yes; then
   cat > conftest.$ac_ext <<EOF
-#line 11168 "configure"
+#line 11196 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 errno = 255
 ; return 0; }
 EOF
-if { (eval echo configure:11175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_set_errno=maybe
 else
@@ -11183,7 +11211,7 @@ fi
 rm -f conftest*
 else
   cat > conftest.$ac_ext <<EOF
-#line 11187 "configure"
+#line 11215 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -11193,7 +11221,7 @@ int main()
 	exit(errno != 255);
 }
 EOF
-if { (eval echo configure:11197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_set_errno=yes
 else
@@ -11216,20 +11244,20 @@ EOF
 
 
 echo $ac_n "checking for setlocale()""... $ac_c" 1>&6
-echo "configure:11220: checking for setlocale()" >&5
+echo "configure:11248: 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 11226 "configure"
+#line 11254 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 setlocale(LC_ALL, "")
 ; return 0; }
 EOF
-if { (eval echo configure:11233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_locale=yes
 else
@@ -11250,13 +11278,13 @@ EOF
 
 
 echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6
-echo "configure:11254: checking if NGROUPS is defined" >&5
+echo "configure:11282: 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 11260 "configure"
+#line 11288 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -11270,7 +11298,7 @@ int main() {
 int x = NGROUPS
 ; return 0; }
 EOF
-if { (eval echo configure:11274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=yes
 else
@@ -11278,7 +11306,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 11282 "configure"
+#line 11310 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -11292,7 +11320,7 @@ int main() {
 int x = NGROUPS_MAX
 ; return 0; }
 EOF
-if { (eval echo configure:11296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -11324,13 +11352,13 @@ fi
 
     
 echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6
-echo "configure:11328: checking if external sys_nerr is declared" >&5
+echo "configure:11356: checking if external sys_nerr is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11334 "configure"
+#line 11362 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -11343,7 +11371,7 @@ int main() {
 long x = (long) sys_nerr
 ; return 0; }
 EOF
-if { (eval echo configure:11347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_sys_nerr=yes
 else
@@ -11371,13 +11399,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6
-echo "configure:11375: checking if external sys_nerr exists" >&5
+echo "configure:11403: checking if external sys_nerr exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11381 "configure"
+#line 11409 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -11387,7 +11415,7 @@ int main() {
 sys_nerr = 2
 ; return 0; }
 EOF
-if { (eval echo configure:11391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_sys_nerr=yes
 else
@@ -11416,13 +11444,13 @@ fi
 
     
 echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6
-echo "configure:11420: checking if external sys_errlist is declared" >&5
+echo "configure:11448: checking if external sys_errlist is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11426 "configure"
+#line 11454 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -11435,7 +11463,7 @@ int main() {
 long x = (long) sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:11439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_sys_errlist=yes
 else
@@ -11463,13 +11491,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6
-echo "configure:11467: checking if external sys_errlist exists" >&5
+echo "configure:11495: checking if external sys_errlist exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11473 "configure"
+#line 11501 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -11479,7 +11507,7 @@ int main() {
 sys_errlist = 2
 ; return 0; }
 EOF
-if { (eval echo configure:11483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_sys_errlist=yes
 else
@@ -11512,17 +11540,17 @@ for ac_hdr in lastlog.h paths.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11516: checking for $ac_hdr" >&5
+echo "configure:11544: 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 11521 "configure"
+#line 11549 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11554: \"$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*
@@ -11549,13 +11577,13 @@ fi
 done
 
 echo $ac_n "checking for lastlog path""... $ac_c" 1>&6
-echo "configure:11553: checking for lastlog path" >&5
+echo "configure:11581: checking for lastlog path" >&5
 if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 11559 "configure"
+#line 11587 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11570,7 +11598,7 @@ int main() {
 char *path = _PATH_LASTLOG
 ; return 0; }
 EOF
-if { (eval echo configure:11574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -11597,7 +11625,7 @@ EOF
 
 
 echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6
-echo "configure:11601: checking for utmp implementation" >&5
+echo "configure:11629: checking for utmp implementation" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11613,7 +11641,7 @@ cf_utmp_includes="
 #endif
 "
 	cat > conftest.$ac_ext <<EOF
-#line 11617 "configure"
+#line 11645 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int main() {
@@ -11622,7 +11650,7 @@ struct $cf_header x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:11626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=$cf_header
 	 break
@@ -11632,7 +11660,7 @@ else
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 11636 "configure"
+#line 11664 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int main() {
@@ -11641,7 +11669,7 @@ struct $cf_header x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:11645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=$cf_header
 	 break
@@ -11671,13 +11699,13 @@ EOF
 	
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6
-echo "configure:11675: checking if utmp.ut_host is declared" >&5
+echo "configure:11703: checking if utmp.ut_host is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11681 "configure"
+#line 11709 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11686,7 +11714,7 @@ int main() {
 struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:11690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_host=yes
 else
@@ -11709,7 +11737,7 @@ fi
 	
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_name is declared""... $ac_c" 1>&6
-echo "configure:11713: checking if utmp.ut_name is declared" >&5
+echo "configure:11741: checking if utmp.ut_name is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_name'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11725,7 +11753,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat > conftest.$ac_ext <<EOF
-#line 11729 "configure"
+#line 11757 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int main() {
@@ -11734,7 +11762,7 @@ struct $cf_cv_have_utmp x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:11738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -11765,7 +11793,7 @@ fi
 	
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6
-echo "configure:11769: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "configure:11797: checking for exit-status in $cf_cv_have_utmp" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11777,7 +11805,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat > conftest.$ac_ext <<EOF
-#line 11781 "configure"
+#line 11809 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11786,7 +11814,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 ; return 0; }
 EOF
-if { (eval echo configure:11790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -11817,13 +11845,13 @@ fi
 	
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6
-echo "configure:11821: checking if utmp.ut_xtime is declared" >&5
+echo "configure:11849: checking if utmp.ut_xtime is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11827 "configure"
+#line 11855 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11832,7 +11860,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 ; return 0; }
 EOF
-if { (eval echo configure:11836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xtime=yes
 else
@@ -11840,7 +11868,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 11844 "configure"
+#line 11872 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11849,7 +11877,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 ; return 0; }
 EOF
-if { (eval echo configure:11853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -11883,13 +11911,13 @@ fi
 	
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6
-echo "configure:11887: checking if utmp.ut_session is declared" >&5
+echo "configure:11915: checking if utmp.ut_session is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11893 "configure"
+#line 11921 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11898,7 +11926,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.ut_session
 ; return 0; }
 EOF
-if { (eval echo configure:11902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_session=yes
 else
@@ -11922,14 +11950,14 @@ fi
 
 	
 echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6
-echo "configure:11926: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "configure:11954: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat > conftest.$ac_ext <<EOF
-#line 11933 "configure"
+#line 11961 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11943,7 +11971,7 @@ struct $cf_cv_have_utmp x;
 	end${cf_prefix}ent();
 ; return 0; }
 EOF
-if { (eval echo configure:11947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_sysv_utmp=yes
 else
@@ -11966,13 +11994,13 @@ fi
 
 
 echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6
-echo "configure:11970: checking if external h_errno exists" >&5
+echo "configure:11998: checking if external h_errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_h_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11976 "configure"
+#line 12004 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -11982,7 +12010,7 @@ int main() {
 h_errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:11986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_h_errno=yes
 else
@@ -12013,7 +12041,7 @@ fi
 
 
 echo $ac_n "checking if bibp: URLs should be supported""... $ac_c" 1>&6
-echo "configure:12017: checking if bibp: URLs should be supported" >&5
+echo "configure:12045: checking if bibp: URLs should be supported" >&5
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
 if test "${enable_bibp_urls+set}" = set; then
@@ -12037,7 +12065,7 @@ EOF
 
 
 echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6
-echo "configure:12041: checking if configuration info should be browsable" >&5
+echo "configure:12069: 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
@@ -12061,7 +12089,7 @@ EOF
 
 
 echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6
-echo "configure:12065: checking if new-style forms-based options screen should be used" >&5
+echo "configure:12093: 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
@@ -12085,7 +12113,7 @@ EOF
 
 
 echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6
-echo "configure:12089: checking if old-style options menu should be used" >&5
+echo "configure:12117: 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
@@ -12109,7 +12137,7 @@ EOF
 
 
 echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6
-echo "configure:12113: checking if experimental address-list page should be used" >&5
+echo "configure:12141: 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
@@ -12133,7 +12161,7 @@ EOF
 
 
 echo $ac_n "checking if experimental charset-selection logic should be used""... $ac_c" 1>&6
-echo "configure:12137: checking if experimental charset-selection logic should be used" >&5
+echo "configure:12165: checking if experimental charset-selection logic should be used" >&5
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
 if test "${enable_charset_choice+set}" = set; then
@@ -12157,7 +12185,7 @@ EOF
 
 
 echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6
-echo "configure:12161: checking if experimental CJK logic should be used" >&5
+echo "configure:12189: checking if experimental CJK logic should be used" >&5
 
 # Check whether --enable-cjk or --disable-cjk was given.
 if test "${enable_cjk+set}" = set; then
@@ -12181,7 +12209,7 @@ EOF
 
 
 echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6
-echo "configure:12185: checking if color-style code should be used" >&5
+echo "configure:12213: 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
@@ -12212,7 +12240,7 @@ EOF
 	echo "$ac_t""yes" 1>&6
 
 	echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6
-echo "configure:12216: checking for location of style-sheet file" >&5
+echo "configure:12244: 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"
@@ -12233,7 +12261,7 @@ esac
 
 if test "$use_dft_colors" != no ; then
 echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6
-echo "configure:12237: checking if you want to use default-colors" >&5
+echo "configure:12265: 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
@@ -12258,7 +12286,7 @@ EOF
 fi
 
 echo $ac_n "checking if experimental file-upload logic should be used""... $ac_c" 1>&6
-echo "configure:12262: checking if experimental file-upload logic should be used" >&5
+echo "configure:12290: checking if experimental file-upload logic should be used" >&5
 
 # Check whether --enable-file-upload or --disable-file-upload was given.
 if test "${enable_file_upload+set}" = set; then
@@ -12282,7 +12310,7 @@ EOF
 
 
 echo $ac_n "checking if experimental htmlized lynx.cfg should be built""... $ac_c" 1>&6
-echo "configure:12286: checking if experimental htmlized lynx.cfg should be built" >&5
+echo "configure:12314: checking if experimental htmlized lynx.cfg should be built" >&5
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
 if test "${enable_htmlized_cfg+set}" = set; then
@@ -12312,7 +12340,7 @@ fi
 
 ### check for ipv6 support
 echo $ac_n "checking whether to enable ipv6""... $ac_c" 1>&6
-echo "configure:12316: checking whether to enable ipv6" >&5
+echo "configure:12344: checking whether to enable ipv6" >&5
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
@@ -12333,7 +12361,7 @@ if test "$enableval" = "yes"; then
 	
 
 echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6
-echo "configure:12337: checking ipv6 stack type" >&5
+echo "configure:12365: checking ipv6 stack type" >&5
 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12353,7 +12381,7 @@ do
 		;;
 	inria) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 12357 "configure"
+#line 12385 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -12371,7 +12399,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 12375 "configure"
+#line 12403 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -12389,7 +12417,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 12393 "configure"
+#line 12421 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -12416,7 +12444,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 12420 "configure"
+#line 12448 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -12434,7 +12462,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 12438 "configure"
+#line 12466 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -12452,7 +12480,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat > conftest.$ac_ext <<EOF
-#line 12456 "configure"
+#line 12484 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -12485,7 +12513,7 @@ cf_ipv6lib=none
 cf_ipv6dir=none
 
 echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6
-echo "configure:12489: checking for IPv6 library if required" >&5
+echo "configure:12517: checking for IPv6 library if required" >&5
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
 	;;
@@ -12519,7 +12547,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6
 if test "$cf_ipv6lib" != "none"; then
 
 	cat > conftest.$ac_ext <<EOF
-#line 12523 "configure"
+#line 12551 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12530,7 +12558,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:12534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -12627,12 +12655,12 @@ rm -f conftest*
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
 	echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:12631: checking for getaddrinfo" >&5
+echo "configure:12659: checking for getaddrinfo" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12636 "configure"
+#line 12664 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo(); below.  */
@@ -12655,7 +12683,7 @@ getaddrinfo();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getaddrinfo=yes"
 else
@@ -12675,10 +12703,10 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6
-echo "configure:12679: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+echo "configure:12707: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 12682 "configure"
+#line 12710 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12689,7 +12717,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:12693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
@@ -12758,10 +12786,10 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6
-echo "configure:12762: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+echo "configure:12790: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 12765 "configure"
+#line 12793 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12772,7 +12800,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:12776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
@@ -12805,7 +12833,7 @@ fi
 
 
 echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6
-echo "configure:12809: checking working getaddrinfo" >&5
+echo "configure:12837: checking working getaddrinfo" >&5
 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12814,7 +12842,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 12818 "configure"
+#line 12846 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12893,7 +12921,7 @@ int main()
 }
 
 EOF
-if { (eval echo configure:12897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_getaddrinfo=yes
 else
@@ -12936,7 +12964,7 @@ fi
 fi
 
 echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6
-echo "configure:12940: checking if experimental element-justification logic should be used" >&5
+echo "configure:12968: checking if experimental element-justification logic should be used" >&5
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
 if test "${enable_justify_elts+set}" = set; then
@@ -12960,7 +12988,7 @@ EOF
 
 
 echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6
-echo "configure:12964: checking if experimental keyboard-layout logic should be used" >&5
+echo "configure:12992: 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
@@ -12984,7 +13012,7 @@ EOF
 
 
 echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6
-echo "configure:12988: checking if experimental JavaScript support should be used" >&5
+echo "configure:13016: 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
@@ -13008,7 +13036,7 @@ EOF
 
 
 echo $ac_n "checking if experimental nested-table logic should be used""... $ac_c" 1>&6
-echo "configure:13012: checking if experimental nested-table logic should be used" >&5
+echo "configure:13040: checking if experimental nested-table logic should be used" >&5
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
 if test "${enable_nested_tables+set}" = set; then
@@ -13032,7 +13060,7 @@ EOF
 
 
 echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6
-echo "configure:13036: checking if html source should be colorized" >&5
+echo "configure:13064: checking if html source should be colorized" >&5
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
 if test "${enable_prettysrc+set}" = set; then
@@ -13056,7 +13084,7 @@ EOF
 
 
 echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6
-echo "configure:13060: checking if read-progress message should show ETA" >&5
+echo "configure:13088: checking if read-progress message should show ETA" >&5
 
 # Check whether --enable-read-eta or --disable-read-eta was given.
 if test "${enable_read_eta+set}" = set; then
@@ -13080,7 +13108,7 @@ EOF
 
 
 echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6
-echo "configure:13084: checking if scrollbar code should be used" >&5
+echo "configure:13112: checking if scrollbar code should be used" >&5
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
@@ -13100,7 +13128,7 @@ fi
 echo "$ac_t""$use_scrollbar" 1>&6
 
 echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6
-echo "configure:13104: checking if source caching should be used" >&5
+echo "configure:13132: 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
@@ -13127,7 +13155,7 @@ EOF
 
 
 echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6
-echo "configure:13131: checking if alternative line-edit bindings should be used" >&5
+echo "configure:13159: checking if 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
@@ -13151,7 +13179,7 @@ EOF
 
 
 echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6
-echo "configure:13155: checking if you want to use extended HTML DTD logic" >&5
+echo "configure:13183: 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
@@ -13175,7 +13203,7 @@ EOF
 
 
 echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6
-echo "configure:13179: checking if partial-display should be used" >&5
+echo "configure:13207: checking if partial-display should be used" >&5
 
 # Check whether --enable-partial or --disable-partial was given.
 if test "${enable_partial+set}" = set; then
@@ -13199,7 +13227,7 @@ EOF
 
 
 echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6
-echo "configure:13203: checking if you want to use external commands" >&5
+echo "configure:13231: 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
@@ -13226,7 +13254,7 @@ EOF
 fi
 
 echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6
-echo "configure:13230: checking if you want to use setfont support" >&5
+echo "configure:13258: 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
@@ -13250,7 +13278,7 @@ EOF
 
 
 echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6
-echo "configure:13254: checking if you want cgi-link support" >&5
+echo "configure:13282: 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
@@ -13269,7 +13297,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6
-echo "configure:13273: checking if you want change-exec support" >&5
+echo "configure:13301: checking if you want change-exec support" >&5
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
 if test "${enable_change_exec+set}" = set; then
@@ -13293,7 +13321,7 @@ EOF
 
 
 echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6
-echo "configure:13297: checking if you want exec-links support" >&5
+echo "configure:13325: 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
@@ -13317,7 +13345,7 @@ EOF
 
 
 echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6
-echo "configure:13321: checking if you want exec-scripts support" >&5
+echo "configure:13349: 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
@@ -13341,7 +13369,7 @@ EOF
 
 
 echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6
-echo "configure:13345: checking if you want internal-links feature" >&5
+echo "configure:13373: 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
@@ -13365,7 +13393,7 @@ EOF
 
 
 echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6
-echo "configure:13369: checking if you want to fork NSL requests" >&5
+echo "configure:13397: 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
@@ -13389,7 +13417,7 @@ EOF
 
 
 echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6
-echo "configure:13393: checking if you want to log URL requests via syslog" >&5
+echo "configure:13421: 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
@@ -13413,7 +13441,7 @@ EOF
 
 
 echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6
-echo "configure:13417: checking if persistent-cookie logic should be used" >&5
+echo "configure:13445: checking if 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
@@ -13437,7 +13465,7 @@ EOF
 
 
 echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6
-echo "configure:13441: checking if you want to underline links" >&5
+echo "configure:13469: checking if you want to underline links" >&5
 
 # Check whether --enable-underlines or --disable-underlines was given.
 if test "${enable_underlines+set}" = set; then
@@ -13461,7 +13489,7 @@ EOF
 
 
 echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6
-echo "configure:13465: checking if help files should be gzip'ed" >&5
+echo "configure:13493: 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
@@ -13481,7 +13509,7 @@ fi
 echo "$ac_t""$use_gzip_help" 1>&6
 
 echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6
-echo "configure:13485: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "configure:13513: 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
@@ -13495,16 +13523,16 @@ echo "$ac_t""$use_zlib" 1>&6
 
 if test ".$use_zlib" != ".no" ; then
 	echo $ac_n "checking if we need to add -I option to get zlib.h""... $ac_c" 1>&6
-echo "configure:13499: checking if we need to add -I option to get zlib.h" >&5
+echo "configure:13527: checking if we need to add -I option to get zlib.h" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 13501 "configure"
+#line 13529 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -13633,12 +13661,12 @@ rm -f conftest*
 	eval 'cf_cv_have_lib_'z'=no'
 	cf_libdir=""
 	echo $ac_n "checking for gzopen""... $ac_c" 1>&6
-echo "configure:13637: checking for gzopen" >&5
+echo "configure:13665: 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 13642 "configure"
+#line 13670 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gzopen(); below.  */
@@ -13661,7 +13689,7 @@ gzopen();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13693: \"$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
@@ -13681,17 +13709,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:13685: checking for gzopen in -lz" >&5
+echo "configure:13713: checking for gzopen in -lz" >&5
 		LIBS="-lz $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 13688 "configure"
+#line 13716 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:13695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'z'=yes'
@@ -13760,17 +13788,17 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6
-echo "configure:13764: checking for -lz in $cf_libdir" >&5
+echo "configure:13792: checking for -lz in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lz $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 13767 "configure"
+#line 13795 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:13774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'z'=yes'
@@ -13804,7 +13832,7 @@ EOF
 fi
 
 echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6
-echo "configure:13808: checking if you want to exclude FINGER code" >&5
+echo "configure:13836: 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
@@ -13828,7 +13856,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6
-echo "configure:13832: checking if you want to exclude GOPHER code" >&5
+echo "configure:13860: 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
@@ -13852,7 +13880,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6
-echo "configure:13856: checking if you want to exclude NEWS code" >&5
+echo "configure:13884: 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
@@ -13876,7 +13904,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6
-echo "configure:13880: checking if you want to exclude FTP code" >&5
+echo "configure:13908: 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
@@ -13905,7 +13933,7 @@ EOF
 # 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:13909: checking if directory-editor code should be used" >&5
+echo "configure:13937: 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
@@ -13932,7 +13960,7 @@ EOF
 
 
 	echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6
-echo "configure:13936: checking if you wish to allow extracting from archives via DirEd" >&5
+echo "configure:13964: checking if you wish to allow extracting from archives via DirEd" >&5
 	
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
 if test "${enable_dired_dearchive+set}" = set; then
@@ -13951,7 +13979,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6
-echo "configure:13955: checking if DirEd mode should override keys" >&5
+echo "configure:13983: checking if DirEd mode should override keys" >&5
 	
 # Check whether --enable-dired-override or --disable-dired-override was given.
 if test "${enable_dired_override+set}" = set; then
@@ -13977,7 +14005,7 @@ fi
 	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:13981: checking if you wish to allow permissions commands via DirEd" >&5
+echo "configure:14009: 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
@@ -14003,7 +14031,7 @@ fi
 	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:14007: checking if you wish to allow executable-permission commands via DirEd" >&5
+echo "configure:14035: 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
@@ -14022,7 +14050,7 @@ fi
 	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:14026: checking if you wish to allow "tar" commands from DirEd" >&5
+echo "configure:14054: 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
@@ -14048,7 +14076,7 @@ fi
 	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:14052: checking if you wish to allow "uudecode" commands from DirEd" >&5
+echo "configure:14080: 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
@@ -14074,7 +14102,7 @@ fi
 	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:14078: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
+echo "configure:14106: 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
@@ -14100,7 +14128,7 @@ fi
 	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:14104: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
+echo "configure:14132: 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
@@ -14127,7 +14155,7 @@ fi
 fi
 
 echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6
-echo "configure:14131: checking if you want long-directory listings" >&5
+echo "configure:14159: 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
@@ -14153,7 +14181,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6
-echo "configure:14157: checking if parent-directory references are permitted" >&5
+echo "configure:14185: 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
@@ -14176,7 +14204,7 @@ test -z "$TELNET" && TELNET=telnet
 # 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:14180: checking for $ac_word" >&5
+echo "configure:14208: 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
@@ -14264,7 +14292,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 14268) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 14296) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -14281,7 +14309,7 @@ test -z "$TN3270" && TN3270=tn3270
 # 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:14285: checking for $ac_word" >&5
+echo "configure:14313: 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
@@ -14369,7 +14397,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 14373) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 14401) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -14386,7 +14414,7 @@ test -z "$RLOGIN" && RLOGIN=rlogin
 # 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:14390: checking for $ac_word" >&5
+echo "configure:14418: 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
@@ -14474,7 +14502,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 14478) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 14506) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -14492,7 +14520,7 @@ test -z "$MV" && MV=mv
 # 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:14496: checking for $ac_word" >&5
+echo "configure:14524: 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
@@ -14580,7 +14608,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 14584) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 14612) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -14598,7 +14626,7 @@ test -z "$GZIP" && GZIP=gzip
 # 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:14602: checking for $ac_word" >&5
+echo "configure:14630: 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
@@ -14686,7 +14714,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 14690) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 14718) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -14703,7 +14731,7 @@ test -z "$UNCOMPRESS" && UNCOMPRESS=gunzip
 # 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:14707: checking for $ac_word" >&5
+echo "configure:14735: 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
@@ -14791,7 +14819,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 14795) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 14823) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -14808,7 +14836,7 @@ test -z "$UNZIP" && UNZIP=unzip
 # 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:14812: checking for $ac_word" >&5
+echo "configure:14840: 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
@@ -14896,7 +14924,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 14900) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 14928) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -14913,7 +14941,7 @@ test -z "$BZIP2" && BZIP2=bzip2
 # 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:14917: checking for $ac_word" >&5
+echo "configure:14945: 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
@@ -15001,7 +15029,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15005) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15033) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -15021,7 +15049,7 @@ test -z "$COMPRESS" && COMPRESS=compress
 # 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:15025: checking for $ac_word" >&5
+echo "configure:15053: 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
@@ -15109,7 +15137,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15113) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15141) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -15126,7 +15154,7 @@ test -z "$RM" && RM=rm
 # 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:15130: checking for $ac_word" >&5
+echo "configure:15158: 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
@@ -15214,7 +15242,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15218) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15246) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -15231,7 +15259,7 @@ test -z "$TAR" && TAR=tar
 # 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:15235: checking for $ac_word" >&5
+echo "configure:15263: 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
@@ -15319,7 +15347,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15323) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15351) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -15336,7 +15364,7 @@ test -z "$UUDECODE" && UUDECODE=uudecode
 # 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:15340: checking for $ac_word" >&5
+echo "configure:15368: 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
@@ -15424,7 +15452,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15428) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15456) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -15441,7 +15469,7 @@ test -z "$ZCAT" && ZCAT=zcat
 # 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:15445: checking for $ac_word" >&5
+echo "configure:15473: 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
@@ -15529,7 +15557,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15533) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15561) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -15546,7 +15574,7 @@ test -z "$ZIP" && ZIP=zip
 # 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:15550: checking for $ac_word" >&5
+echo "configure:15578: 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
@@ -15634,7 +15662,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15638) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15666) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -15662,7 +15690,7 @@ test -z "$INSTALL" && INSTALL=install
 # Extract the first word of "install", so it can be a program name with args.
 set dummy install; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15666: checking for $ac_word" >&5
+echo "configure:15694: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15750,7 +15778,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	
-echo "(line 15754) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 15782) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >> confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -15783,7 +15811,7 @@ if test $cf_cv_screen = pdcurses ; then
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:15787: checking for X" >&5
+echo "configure:15815: checking for X" >&5
 
 
 # Check whether --with-x or --without-x was given.
@@ -15846,12 +15874,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 15850 "configure"
+#line 15878 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15883: \"$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*
@@ -15920,14 +15948,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15924 "configure"
+#line 15952 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:15931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -16027,7 +16055,7 @@ clix*)
 	# FIXME: modify the library lookup in autoconf to
 	# allow _s.a suffix ahead of .a
 	echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6
-echo "configure:16031: checking for open in -lc_s" >&5
+echo "configure:16059: checking for open in -lc_s" >&5
 ac_lib_var=`echo c_s'_'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
@@ -16035,7 +16063,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16039 "configure"
+#line 16067 "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
@@ -16046,7 +16074,7 @@ int main() {
 open()
 ; return 0; }
 EOF
-if { (eval echo configure:16050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16078: \"$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
@@ -16063,7 +16091,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lc_s $LIBS"
 	echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6
-echo "configure:16067: checking for gethostname in -lbsd" >&5
+echo "configure:16095: checking for gethostname in -lbsd" >&5
 ac_lib_var=`echo bsd'_'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
@@ -16071,7 +16099,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16075 "configure"
+#line 16103 "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
@@ -16082,7 +16110,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:16086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16114: \"$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
@@ -16099,7 +16127,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lbsd $LIBS"
 	echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6
-echo "configure:16103: checking for gethostname in -lnsl_s" >&5
+echo "configure:16131: checking for gethostname in -lnsl_s" >&5
 ac_lib_var=`echo nsl_s'_'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
@@ -16107,7 +16135,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16111 "configure"
+#line 16139 "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
@@ -16118,7 +16146,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:16122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16150: \"$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
@@ -16135,7 +16163,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lnsl_s $LIBS"
 	echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6
-echo "configure:16139: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:16167: checking for XOpenDisplay in -lX11_s" >&5
 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16143,7 +16171,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16147 "configure"
+#line 16175 "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
@@ -16154,7 +16182,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:16158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16186: \"$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
@@ -16171,7 +16199,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lX11_s $LIBS"
 	echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6
-echo "configure:16175: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:16203: checking for XtAppInitialize in -lXt_s" >&5
 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16179,7 +16207,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXt_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16183 "configure"
+#line 16211 "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
@@ -16190,7 +16218,7 @@ int main() {
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:16194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16222: \"$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
@@ -16231,7 +16259,7 @@ fi
 	;;
 *)
 	echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:16235: checking for socket in -lsocket" >&5
+echo "configure:16263: 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
@@ -16239,7 +16267,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16243 "configure"
+#line 16271 "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
@@ -16250,7 +16278,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:16254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16282: \"$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
@@ -16278,7 +16306,7 @@ else
 fi
 
 	echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:16282: checking for gethostname in -lnsl" >&5
+echo "configure:16310: 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
@@ -16286,7 +16314,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16290 "configure"
+#line 16318 "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
@@ -16297,7 +16325,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:16301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16329: \"$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
@@ -16348,17 +16376,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:16352: checking whether -R must be followed by a space" >&5
+echo "configure:16380: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 16355 "configure"
+#line 16383 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:16362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -16374,14 +16402,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 16378 "configure"
+#line 16406 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:16385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -16413,7 +16441,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:16417: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:16445: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16421,7 +16449,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16425 "configure"
+#line 16453 "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
@@ -16432,7 +16460,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:16436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16464: \"$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
@@ -16454,7 +16482,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:16458: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:16486: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16462,7 +16490,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16466 "configure"
+#line 16494 "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
@@ -16473,7 +16501,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:16477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16505: \"$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
@@ -16502,12 +16530,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:16506: checking for gethostbyname" >&5
+echo "configure:16534: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16511 "configure"
+#line 16539 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -16530,7 +16558,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -16551,7 +16579,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:16555: checking for gethostbyname in -lnsl" >&5
+echo "configure:16583: 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
@@ -16559,7 +16587,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16563 "configure"
+#line 16591 "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
@@ -16570,7 +16598,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:16574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16602: \"$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
@@ -16600,12 +16628,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:16604: checking for connect" >&5
+echo "configure:16632: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16609 "configure"
+#line 16637 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -16628,7 +16656,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -16649,7 +16677,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:16653: checking for connect in -lsocket" >&5
+echo "configure:16681: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16657,7 +16685,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16661 "configure"
+#line 16689 "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
@@ -16668,7 +16696,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:16672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16700: \"$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
@@ -16692,12 +16720,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:16696: checking for remove" >&5
+echo "configure:16724: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16701 "configure"
+#line 16729 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -16720,7 +16748,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -16741,7 +16769,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:16745: checking for remove in -lposix" >&5
+echo "configure:16773: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16749,7 +16777,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16753 "configure"
+#line 16781 "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
@@ -16760,7 +16788,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:16764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16792: \"$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
@@ -16784,12 +16812,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:16788: checking for shmat" >&5
+echo "configure:16816: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16793 "configure"
+#line 16821 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -16812,7 +16840,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -16833,7 +16861,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:16837: checking for shmat in -lipc" >&5
+echo "configure:16865: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16841,7 +16869,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16845 "configure"
+#line 16873 "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
@@ -16852,7 +16880,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:16856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16884: \"$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
@@ -16885,7 +16913,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:16889: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:16917: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16893,7 +16921,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16897 "configure"
+#line 16925 "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
@@ -16904,7 +16932,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:16908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16936: \"$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
@@ -16970,14 +16998,14 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat > conftest.$ac_ext <<EOF
-#line 16974 "configure"
+#line 17002 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:16981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -16995,7 +17023,7 @@ rm -f conftest*
 fi
 
 	echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:16999: checking for XOpenDisplay in -lX11" >&5
+echo "configure:17027: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17003,7 +17031,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17007 "configure"
+#line 17035 "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
@@ -17014,7 +17042,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:17018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17046: \"$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
@@ -17035,7 +17063,7 @@ else
 fi
 
 	echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:17039: checking for XtAppInitialize in -lXt" >&5
+echo "configure:17067: checking for XtAppInitialize in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17043,7 +17071,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17047 "configure"
+#line 17075 "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
@@ -17054,7 +17082,7 @@ int main() {
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:17058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17086: \"$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
@@ -17122,14 +17150,14 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat > conftest.$ac_ext <<EOF
-#line 17126 "configure"
+#line 17154 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:17133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -17182,7 +17210,7 @@ fi
 
 
 echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:17186: checking for XextCreateExtension in -lXext" >&5
+echo "configure:17214: checking for XextCreateExtension in -lXext" >&5
 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17190,7 +17218,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17194 "configure"
+#line 17222 "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
@@ -17201,7 +17229,7 @@ int main() {
 XextCreateExtension()
 ; return 0; }
 EOF
-if { (eval echo configure:17205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17233: \"$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
@@ -17240,13 +17268,13 @@ do
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
 			echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-echo "configure:17244: checking for $cf_test in $cf_path" >&5
+echo "configure:17272: checking for $cf_test in $cf_path" >&5
 		else
 			echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:17247: checking for $cf_test" >&5
+echo "configure:17275: checking for $cf_test" >&5
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 17250 "configure"
+#line 17278 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -17255,7 +17283,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:17259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -17302,23 +17330,23 @@ do
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
 				echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-echo "configure:17306: checking for $cf_lib in $cf_path" >&5
+echo "configure:17334: checking for $cf_lib in $cf_path" >&5
 			else
 				LIBS="$cf_lib $LIBS"
 				echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-echo "configure:17310: checking for $cf_test in $cf_lib" >&5
+echo "configure:17338: checking for $cf_test in $cf_lib" >&5
 			fi
 			cf_SAVE="$LIBS"
 			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 17315 "configure"
+#line 17343 "configure"
 #include "confdefs.h"
 
 int main() {
 $cf_test()
 ; return 0; }
 EOF
-if { (eval echo configure:17322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -17397,14 +17425,14 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat > conftest.$ac_ext <<EOF
-#line 17401 "configure"
+#line 17429 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:17408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -17422,7 +17450,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:17426: checking for XOpenDisplay in -lX11" >&5
+echo "configure:17454: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17430,7 +17458,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17434 "configure"
+#line 17462 "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
@@ -17441,7 +17469,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:17445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17473: \"$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
@@ -17462,14 +17490,14 @@ else
 fi
 
 echo $ac_n "checking for XCurses library""... $ac_c" 1>&6
-echo "configure:17466: checking for XCurses library" >&5
+echo "configure:17494: checking for XCurses library" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 LIBS="-lXCurses $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17473 "configure"
+#line 17501 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -17479,7 +17507,7 @@ int main() {
 XCursesExit();
 ; return 0; }
 EOF
-if { (eval echo configure:17483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_lib_XCurses=yes
 else
@@ -17513,7 +17541,7 @@ fi
 else
 	
 echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6
-echo "configure:17517: checking if we can include termio.h with curses" >&5
+echo "configure:17545: 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
@@ -17522,7 +17550,7 @@ else
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat > conftest.$ac_ext <<EOF
-#line 17526 "configure"
+#line 17554 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -17531,7 +17559,7 @@ int main() {
 putchar(0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:17535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_curses=yes
 else
@@ -17561,17 +17589,17 @@ if test $cf_cv_screen != slang ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17565: checking for $ac_hdr" >&5
+echo "configure:17593: 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 17570 "configure"
+#line 17598 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17603: \"$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*
@@ -17599,7 +17627,7 @@ done
 
 	
 echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
-echo "configure:17603: checking if curses supports alternate-character set" >&5
+echo "configure:17631: 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
@@ -17607,7 +17635,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat > conftest.$ac_ext <<EOF
-#line 17611 "configure"
+#line 17639 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17616,7 +17644,7 @@ int main() {
 chtype x = $mapname['l']; $mapname['m'] = 0
 ; return 0; }
 EOF
-if { (eval echo configure:17620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17648: \"$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
@@ -17639,13 +17667,13 @@ EOF
 
 	
 echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
-echo "configure:17643: checking if curses supports fancy attributes" >&5
+echo "configure:17671: 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 17649 "configure"
+#line 17677 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17658,7 +17686,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 	
 ; return 0; }
 EOF
-if { (eval echo configure:17662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fancy_curses=yes
 else
@@ -17681,13 +17709,13 @@ EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
 echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
-echo "configure:17685: checking for obsolete/broken version of ncurses" >&5
+echo "configure:17713: 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 17691 "configure"
+#line 17719 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17701,7 +17729,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:17705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_broken=no
 else
@@ -17726,13 +17754,13 @@ fi
 
 	
 echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:17730: checking if curses supports color attributes" >&5
+echo "configure:17758: 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 17736 "configure"
+#line 17764 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17747,7 +17775,7 @@ chtype x = COLOR_BLUE;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:17751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_color_curses=yes
 else
@@ -17781,17 +17809,17 @@ unistd.h \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17785: checking for $ac_hdr" >&5
+echo "configure:17813: 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 17790 "configure"
+#line 17818 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17823: \"$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*
@@ -17822,17 +17850,17 @@ if test "$ISC" = yes ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17826: checking for $ac_hdr" >&5
+echo "configure:17854: 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 17831 "configure"
+#line 17859 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17864: \"$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*
@@ -17867,16 +17895,16 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	esac
 	if test "$termios_bad" = maybe ; then
 	echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6
-echo "configure:17871: checking whether termios.h needs _POSIX_SOURCE" >&5
+echo "configure:17899: checking whether termios.h needs _POSIX_SOURCE" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 17873 "configure"
+#line 17901 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int main() {
 struct termios foo; int x = foo.c_iflag
 ; return 0; }
 EOF
-if { (eval echo configure:17880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   termios_bad=no
 else
@@ -17885,7 +17913,7 @@ else
   rm -rf conftest*
   
 		cat > conftest.$ac_ext <<EOF
-#line 17889 "configure"
+#line 17917 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -17894,7 +17922,7 @@ int main() {
 struct termios foo; int x = foo.c_iflag
 ; return 0; }
 EOF
-if { (eval echo configure:17898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   termios_bad=unknown
 else
@@ -17917,7 +17945,7 @@ fi
 
 
 echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:17921: checking declaration of size-change" >&5
+echo "configure:17949: 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
@@ -17931,7 +17959,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat > conftest.$ac_ext <<EOF
-#line 17935 "configure"
+#line 17963 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -17970,7 +17998,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:17974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sizechange=yes
 else
@@ -18009,20 +18037,20 @@ fi
 
 	
 echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
-echo "configure:18013: checking if ttytype is declared in curses library" >&5
+echo "configure:18041: 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 18019 "configure"
+#line 18047 "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:18026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_ttytype=yes
 else
@@ -18043,13 +18071,13 @@ EOF
 
 	
 echo $ac_n "checking if curses supports wide characters""... $ac_c" 1>&6
-echo "configure:18047: checking if curses supports wide characters" >&5
+echo "configure:18075: checking if curses supports wide characters" >&5
 if eval "test \"`echo '$''{'cf_cv_widec_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 18053 "configure"
+#line 18081 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -18063,7 +18091,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:18067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_widec_curses=yes
 else
@@ -18086,13 +18114,13 @@ EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
 	echo $ac_n "checking if we must include wchar.h to declare mbstate_t""... $ac_c" 1>&6
-echo "configure:18090: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "configure:18118: checking if we must include wchar.h to declare mbstate_t" >&5
 if eval "test \"`echo '$''{'cf_cv_widec_mbstate'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 18096 "configure"
+#line 18124 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -18101,7 +18129,7 @@ int main() {
 mbstate_t state
 ; return 0; }
 EOF
-if { (eval echo configure:18105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_widec_mbstate=no
 else
@@ -18109,7 +18137,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 18113 "configure"
+#line 18141 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -18119,7 +18147,7 @@ int main() {
 mbstate_t state
 ; return 0; }
 EOF
-if { (eval echo configure:18123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_widec_mbstate=yes
 else
@@ -18153,13 +18181,13 @@ fi
 
 	
 echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6
-echo "configure:18157: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "configure:18185: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 18163 "configure"
+#line 18191 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -18169,7 +18197,7 @@ int main() {
 	long x = winnstr(stdscr, "", 0)
 ; return 0; }
 EOF
-if { (eval echo configure:18173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_need_xopen_extension=no
 else
@@ -18177,7 +18205,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 18181 "configure"
+#line 18209 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -18188,7 +18216,7 @@ int main() {
 	long x = winnstr(stdscr, "", 0)
 ; return 0; }
 EOF
-if { (eval echo configure:18192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_need_xopen_extension=yes
 else
@@ -18231,9 +18259,9 @@ do
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 	echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6
-echo "configure:18235: checking for ${cf_func}" >&5
+echo "configure:18263: checking for ${cf_func}" >&5
 	
-echo "(line 18237) testing ${cf_func} ..." 1>&5
+echo "(line 18265) testing ${cf_func} ..." 1>&5
 
 	if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18242,7 +18270,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat > conftest.$ac_ext <<EOF
-#line 18246 "configure"
+#line 18274 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -18267,7 +18295,7 @@ exit(foo == 0);
 			
 ; return 0; }
 EOF
-if { (eval echo configure:18271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -18487,6 +18515,7 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@LINT@%$LINT%g
+s%@ECHO_LT@%$ECHO_LT%g
 s%@ECHO_LD@%$ECHO_LD%g
 s%@RULE_CC@%$RULE_CC%g
 s%@SHOW_CC@%$SHOW_CC%g
diff --git a/configure.in b/configure.in
index a859be85..f674f941 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
-dnl $Format: AC_REVISION($ProjectVersion: 2.8.5dev.15 $\""$)
+dnl $Format: AC_REVISION($ProjectVersion: 2.8.5dev.16 $\""$)
 AC_REVISION(none)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
diff --git a/lynx.cfg b/lynx.cfg
index 4e9ae694..b66cb904 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.5dev.15"
+#PRCS LYNX_VERSION "2.8.5dev.16"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sun, 27 Apr 2003 17:38:00 -0700"
+#PRCS LYNX_DATE "Sun, 01 Jun 2003 18:16:28 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
@@ -656,7 +656,7 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 .h2 INFOSECS
 .h2 MESSAGESECS
 .h2 ALERTSECS
-# The following three definitions set the number of seconds for
+# The following definitions set the number of seconds for
 # pauses following statusline messages that would otherwise be
 # replaced immediately, and are more important than the unpaused
 # progress messages.  Those set by INFOSECS are also basically
@@ -676,6 +676,11 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 #MESSAGESECS:2
 #ALERTSECS:3
 
+.h2 DEBUGSECS
+# Set DEBUGSECS to a nonzero value to slow down progress messages
+# (see "-delay" option).
+#DEBUGSECS:0
+
 .h2 REPLAYSECS
 # Set REPLAYSECS to a nonzero value to allow for slow replaying of
 # command scripts (see "-cmd_script" option).
@@ -3216,6 +3221,8 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:emacs_keys:ON
 #ENABLE_LYNXRC:file_editor:ON
 #ENABLE_LYNXRC:file_sorting_method:ON
+#ENABLE_LYNXRC:force_cookie_prompt:OFF
+#ENABLE_LYNXRC:force_ssl_prompt:OFF
 #ENABLE_LYNXRC:kblayout:ON
 #ENABLE_LYNXRC:keypad_mode:ON
 #ENABLE_LYNXRC:lineedit_mode:ON
@@ -3268,3 +3275,11 @@ COLOR:6:brightred:black
 #UUDECODE_PATH:
 #ZCAT_PATH:
 #ZIP_PATH:
+
+.h2 FORCE_SSL_PROMPT
+# If FORCE_SSL_PROMPT is set to "yes", then questionable conditions, such as
+# self-signed certificates will be ignored.  If set to "no", these will be
+# reported, but not attempted.  The default "prompt" permits the user to make
+# this choice on a case-by-case basis.
+#
+#FORCE_SSL_PROMPT:PROMPT
diff --git a/lynx.man b/lynx.man
index b1470317..5d5fcfce 100644
--- a/lynx.man
+++ b/lynx.man
@@ -188,6 +188,7 @@ toggles handling of Set-Cookie headers.
 .TP
 .B \-core
 toggles forced core dumps on fatal errors.
+Turn this option off to ask lynx to force a core dump if a fatal error occurs.
 .TP
 .B \-crawl
 with \fB\-traversal,\fR output each page to a file.
@@ -200,6 +201,9 @@ left/right scrolling of the display.
 .B \-debug_partial
 separate incremental display stages with MessageSecs delay
 .TP
+.B \-delay
+add DebugSecs delay after each progress-message
+.TP
 .B \-display\fR=\fIDISPLAY
 set the display variable for X rexec-ed programs.
 .TP
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index e5930fbe..f82a2858 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -491,7 +491,7 @@ The form-based menu shown below is an HTML file generated at runtime,
 in which the user fills in choices as in any ordinary HTML form.
 <pre>
 
-                    Options Menu (Lynx Version 2.8.4rel.1)
+                    Options Menu (Lynx Version 2.8.5dev.15)
 
       Accept Changes - Reset Changes Left Arrow cancels changes <A
 HREF="keystrokes/option_help.html">HELP!</A>
@@ -502,8 +502,12 @@ HREF="keystrokes/option_help.html">HELP!</A>
   General Preferences
   User mode                        : [Advanced....]
   Editor                           : __________________________________________
-  Searching type                   : [Case insensitive]
+  Type of Search                   : [Case insensitive]
+
+  Security and Privacy
   Cookies (!)                      : [ask user..]
+  Invalid-Cookie Prompting (!)     : [prompt normally___]
+  SSL Prompting (!)                : [prompt normally___]
 
   Keyboard Input
   Keypad mode                      : [Links are numbered................]
@@ -521,6 +525,7 @@ HREF="keystrokes/option_help.html">HELP!</A>
   Document Appearance
   Show color                       : [ON....]
   Show cursor                      : [OFF]
+  Show scrollbar                   : [OFF]
   Popups for select fields         : [ON.]
   HTML error recovery (!)          : [strict (SortaSGML mode)]
   Show images (!)                  : [as labels]
@@ -1006,7 +1011,7 @@ also will cancel the mailing.[<A HREF="#ToC-Mail">ToC</A>]
 <h2 ID="News"><A NAME="News"><em>USENET News posting</em></A></h2>
 
 While reading <a
-href="http://www.w3.org/hypertext/DataSources/News/Groups/Overview.html"
+href="http://www.w3.org/LineMode/User/AboutNewsServers.html"
 >news</a> articles with Lynx you should see a link that says
 <em>Reply to: user@host</em> and, if the nntp server from which you
 received the article supports posting from your site, a link that says
@@ -1034,6 +1039,8 @@ received the article supports posting from your site, a link that says
             followups (replies) to nntp servers with Lynx.
             [<A HREF="#ToC-News">ToC</A>]
 </dl>
+See also <
+href="http://www.w3.org/Protocols/rfc977/rfc977">RFC977.
 
 <h2 ID="Bookmarks"><A NAME="Bookmarks"><em>Lynx bookmarks</em></A></h2>
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 00000000..d21673e8
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,5298 @@
+# Simplified Chinese translation
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Wu XiaoGuang <xgwu@linux.net.cn>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx-2.8.5pre9\n"
+"Report-Msgid-Bugs-To: bug-gnu-lynx@gnu.org\n"
+"POT-Creation-Date: 2003-04-27 18:12-0400\n"
+"PO-Revision-Date: 2002-10-15 15:13+0800\n"
+"Last-Translator: Wang Jian <lark@linux.net.cn>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. ******************************************************************
+#. * The following definitions are for status line prompts, messages, or
+#. * warnings issued by Lynx during program execution.  You can modify
+#. * them to make them more appropriate for your site.  We recommend that
+#. * you extend these definitions to other languages using the gettext
+#. * library.  There are also scattered uses of 'gettext()' throughout the
+#. * Lynx source, covering all but those messages which (a) are used for
+#. * debugging (CTRACE) or (b) are constants used in interaction with
+#. * other programs.
+#. *
+#. * Links to collections of alternate definitions, developed by the Lynx
+#. * User Community, are maintained in Lynx links:
+#. *
+#. *    http://www.subir.com/lynx.html
+#. *
+#. * See ABOUT-NLS and po/readme for details and location of contributed
+#. * translations.  When no translation is available, the English default is
+#. * used.
+#.
+#: LYMessages.c:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "警告！：%s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "欢迎"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "您确信要退出吗？"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "真的要离开 Lynx ？"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "连接被中断。"
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "数据传输被中断。"
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "已取消！"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "正在取消！"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "非常好！"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr ""
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "完成！"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "请求错误！"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "前一个"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "下一屏"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "求助！"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr "，在这方面的帮助"
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "命令：移动用方向键，求助用‘？’，退出用‘q’，返回用‘<-’。"
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "――更多请按空格，移动用方向键，求助用‘？’，退出用‘q’。"
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "―― 看下一页请按回车 ――"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "是不是 URL 太长了 "
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "（文本条目区域）未被激活，请按回车激活。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "（文本域）未激活，请按回车激活。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "（文本域）未激活，请按回车激活（编辑器用 %s ）。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "（表单区域）未激活，编辑按回车。"
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "（表单区域）未激活，编辑按回车（ 不作修改递交请按 %s ）。"
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "（表单区域）未激活，编辑按回车，递交按两次回车。"
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "（ mailto 表单域）未激活，修正按回车。"
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "（ Password 条目域）未被激活，按回车激活。"
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "不准改动的文件条目域，离开按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "（文件条目域）输入文件名，离开按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "（文本条目域）输入文字，离开按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "（文本区域）输入文字，离开按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "（文本区域）输入文字，离开按向上键、向上键或 Tab 键（编辑器用 %s）。"
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "不准改动的表单文本区域，离开按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "（表单区域）输入文字，递交按回车。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "（表单区域）输入文字，递交按回车（取消缓存用 %s）"
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "（表单区域）输入文字，递交按回车，离开用方向键或 Tab 。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "不准改动的表单域，离开用向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "（mailto 表单域）输入文字，递交按回车，离开按方向键。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "（mailto 表单域）禁止发信，所以您无法递交。"
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "（Password 条目域）输入文字，离开用向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "不准改动的 password 表单，离开按向上、向上方向键或 Tab 键。"
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "（Checkbox 域）翻卷按向右键或回车。"
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "不准改动的 chenkbox 表单，离开用向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "（Radio 按钮） 翻卷用向右键或回车。"
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "不准改动的 radio 按钮表单，离开按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "递交（取消缓存用‘x’）至"
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "递交至"
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "（表单的 submit 按钮）递交按向右或回车键（取消缓存用‘x’）。"
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "（表单的 submit 按钮） 递交按向右键或回车键。"
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "禁用表单的 submit 按钮，离开按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "将 mailto 表单递交至"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "（mailto 表单的 submit 按钮）递交按向右键或回车键。"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "（mailto 表单的 submit 按钮）Mail 已禁用 ，所以您无法递交。 "
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "（表单的 reset 按钮） 回复至默认表单，请按向右键或回车键。"
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "表单的 reset 按钮已禁用，离开请按向上键、向上键或 Tab 键。"
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "（Option list）选择请按方向键，选中请按回车。"
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "（Choice list）选择请按方向键，选中请按回车。"
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "不准改动的 option list ，预览或离开请按回车及方向键。"
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "不准改动的 choice list ，预览或离开请按回车及方向键。"
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "表单正在递交中……"
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "表单正被重置……"
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "正在重新再入文档，将遗失表单条目！"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "警告：无法将表单的数据转成 %s 字符集！"
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "（NORMAL LINK） 激活用向右键或回车。"
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "此时无法获取被请求的资源。"
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "输入 Lynx keystroke 命令："
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "寻找"
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "获得 %s"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "忽略 %s"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "使用 %s"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "非法的 URL ：%s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "错误的地址格式 %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "无法访问 WWW 文件！！！"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "这是个可搜索的 index ，请用 %s 进行搜索。"
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "――More――  这是个可搜索的 index ，请用 %s 进行搜索。"
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "您输入了一个非法的链接号。"
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "当前正在浏览源文件。查看效果，请按“\\”。"
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "方向键：移动用上下键；选中链接用向右键；返回用向左键。\n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr ""
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "用键盘敲入文字。"
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 Ctrl-U ；只删除一个字符，用 [Backspace] "
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 Ctrl-U ；只删除一个字符，用 [Backspace]"
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 %s ；只删除一个字符，用 [Backspace]"
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 %s ；只删除一个字符，用 [Backspace]"
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "错误的 mailto 表单！已经取消！"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "警告！邮件地址中的控制代码已经被 ？取代"
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "禁用邮件！无法递交。"
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "Mailto 表单递交出错！"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "取消了 Mailto 递交表单"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "正在发送表单内容..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "mailto URL 中没有邮件地址！"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "无法为 mailto URL 打开临时文件！"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "您想要包含原始消息吗？"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "您想要包含预先解析的源文件吗？"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "正在调用您的编辑器来写邮件"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "调用编辑器出错，请核查 option menu 中的编辑器定义"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "发送评语？"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "发送消息？"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "正在发送您的消息……"
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "正在发送您的评语："
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "不在文本域中，无法使用外挂的编辑器。"
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "不在文本域中，无法使用命令。"
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "file：ACTIONs 已禁用！"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr "file：链接的 URLs 已禁用"
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "本地文件拒绝访问。"
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "file：无法访问书签中的 URLs "
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "无法通过外部文档访问指定 URL ！"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "返回 Lynx ，请按回车。"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr "正在调用 DCL 子进程，返回 Lynx ，请用 ‘logout’。\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "返回 Lynx ，请输入 EXIT 。\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "正在调用默认的 shell ，返回 Lynx ，请用 ‘exit’。\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr "当前无法调用。"
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "当前无法用 ‘d’ownload 命令。"
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "您无法下载输入域。"
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr "表单含 mailto 动作！无法下载。"
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "您无法下载一个 mailto: 链接。"
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "您无法下载 cookies 。"
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "您无法下载一个 printing option 。"
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "您无法下载一个 upload option 。"
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr "您无法下载一个 permit option 。"
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "无法下载指定的 URL"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "没东西下载。"
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr ""
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr ""
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "被包含所有图像的链接！正在重新载入……"
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "回复标准图像处理！正在重新载入……"
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "伪 ALT 键不是以 ALT 字符串，而是以内联方式插入！正在重新载入……"
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "将忽略没有 ALT 字符串指定的内联方式！正在重新载入……"
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "关闭原始的 8-bit 或 CJK 模式！正在重新载入……"
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "开启原始的 8-bit 或 CJK 模式！正在重新载入……"
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "向 D)ocument 还是 L)ink 发送 HEAD 请求，亦或 C)ancel ? (d,l,c): "
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "向 D)ocument 发送 HEAD 请求，亦或 C)ancel ? (d,l,c): "
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "抱歉，该文档并非 http URL 。"
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "抱歉，该链接并非 http URL 。"
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "抱歉，该表单的 ACTION 已禁用。"
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "抱歉，该表单的 ACTION 并非 http URL 。"
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "并非为 http URL 或 表单的 ACTION ！"
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "指定的 URL 不是表单的 ACTION ！"
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "URL 不在开始的域中！"
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "已禁止新闻发布！"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "已取消对文件管理的支持！"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr "当前没有跳转文件。"
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "跳转到（‘?’将给出列表）："
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr "不允许跳转到 URL 快捷键！"
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr "不允许随机的 URL ！请用快捷键。"
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr "目前为止，还没有使用随机的 URLs 。"
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "当前书签功能已禁用。"
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "通过书签执行已禁用"
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "没有指定书签文件。请用 %s 查看 options 。"
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "无法打开 tempfile 完成 X Mosaic hotlist 的转换。"
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "错误――无法打开书签文件。"
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "无法打开书签文件以删去链接。"
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr "无法打开草稿文件以删去链接。"
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr "重命名草稿文件时出错。"
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "重命名临时文件时出错。"
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "无法打开临时文件以删去链接。"
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "无法再打开临时文件以删去链接。"
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "书签文件中的链接并非单独在一行中。"
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "删去书签时出错。"
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr "无法遍历书签文件 （只有 http URLs）。"
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "无法打开书签文件，用 'a' 先保存链接"
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "该书签文件中没有链接！"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr ""
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr ""
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr ""
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "文档中含有 POST 内容的表单，故无法保存为书签。"
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "无法保存表单的域／链接"
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "无法将历史记录、showinfo、menu 及 list files 保存为书签。"
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "您真的要将此链接从书签中删除？"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "地址有误。"
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr ""
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr ""
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr ""
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr ""
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr ""
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr ""
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "已经位于文档底部。"
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "已经位于文档开头。"
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "已经位于文档的第 %d 页。"
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "当前就是链接号 %d 。"
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "已经位于第一个文档"
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "此行前面的文档中没有链接。"
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "此行后面的文档中没有链接。"
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "已经到达最大长度！删除文字，或离开该区域。"
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "不在表格提交按钮或普通链接上。"
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "无论如何，得在单选框中选一个！"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "没有该表单的提交按钮，要提交单独的文本域吗？"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "想要回到前一个文档吗？"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "离开该区域，请用方向键或 Tab 。"
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "请输入文字。离开该区域，请用方向键或 Tab 。"
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "＊＊ HTML 有问题！！没有定义表单动作。＊＊"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "HTML 有问题！！无法新建弹出创口！"
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "无法新建弹出创口！"
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "访问随机 URL 功能已禁用！"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "不允许访问 non-http URL！"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "不允许访问 \\'%s\\\" URLs"
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "打开 URL："
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "编辑当前的 URL："
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "编辑上一个所在的 URL："
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "编辑上一个所在的 URL："
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "当前文档含有 POST 数据。"
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "编辑此文档的 URL："
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "编辑此链接的 URL："
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "您无法编辑文件管理的 URLs"
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "输入资料库的查询："
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "输入 whereis 查询："
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "编辑当前的查询："
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "编辑前一条查询："
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "编辑前一条查询："
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "重新递交当前查询，请用 Ctrl-R 。"
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "编辑当前快捷键："
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "编辑前一个快捷键："
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "编辑前一个快捷键："
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr "'%c' 键无法映射到一个跳转的文件！"
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "无法定位跳转的文件！"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "无法打开跳转的文件！"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "读取跳转文件时出错！"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "读取跳转文件时内存不够！"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "读取跳转表格时内存不够！"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "当前没有可用的索引。"
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "您真的要到主窗口吗？"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "已经位于主窗口！"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "不是可搜索文档 ―― 搜索文本字符串，请按 '/'"
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "这个文件没有定义所有者，所以您无法发送评语"
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "未定义所有者。用 %s ？"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "您想要发送评语吗？"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "不允许使用邮件，所以您无法发送评语"
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "当前 'e'dit 命令已禁用。"
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "当前外部编辑已禁用。"
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "系统错误 ―― 无法获取状态。"
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "没有定义编辑器！"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "当前 'p'rint 命令已禁用。"
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "文档没有工具栏链接或 Banner 。"
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr "无法打开遍历的文件。"
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr "无法打开遍历的 found 文件。"
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr "无法打开 reject 文件。"
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr "无法打开遍历的错误输出文件"
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr "遍历被中断"
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "跟随链接（或 goto 链接及页面）号码："
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "选择可选项（或页面）号码："
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "当前就是可选项号码 %d 。"
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "已经位于可选项列表底部。"
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "已经位于可选项列表顶部。"
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "已经位于该可选项列表的 %d 页。"
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "您输入了一个非法的可选项号码。"
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** HTML 有问题！！ 请用 -trace 进行诊断。**"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "请给出要保存的文件名"
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr "无法将数据保存到文件 ―― 请在本地运行 WWW"
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "无法打开临时文件！"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "无法打开输出文件！正在取消！"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "禁止执行。"
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "该文件没有启用执行，请参看可选项菜单（用 %s ）。"
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "此版本在编译时没有加入执行功能。"
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "该文件无法在当前终端中运行。"
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "该文件无法在当前终端中运行：D)ownload，或 C)ancel"
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr ""
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "正在取消文件。"
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "重新获取文件，―― 请稍候 ――"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "请输入一个文件名："
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "编辑前一个文件名："
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "编辑前一个文件名："
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "输入一个新的文件名："
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "文件名不能以点号开头。"
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr "文件已存在，要创建新版本吗？"
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "文件已存在，要覆盖吗？"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "无法写入文件。"
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "出错！―― 下载命令配置错误。"
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "无法下载文件。"
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "正在读取目录……"
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "正在建立目录列表……"
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "正在保存……"
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "无法编辑文件 '%s' 。"
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "无法存取文档！"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "无法存取文件。"
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "无法存取目录。"
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "无法载入数据。"
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "当前 Lynx 无法 (e)dit 远程的 WWW 文件。"
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "该文件无法由外部的编辑器进行 (e)dit 。"
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "规则有问题"
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "操作数不够："
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "您没有获得修改此文件的授权。"
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "标题："
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "主题："
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "用户名："
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "密码："
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx：要求用户名和密码！！！"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx：要求密码！！！"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "要清除该对话中的所有验证信息吗？"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "验证信息已被清除。"
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "验证失败，再试一次？"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "已禁用 cgi 功能。"
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "此版本在编译时没有加入 Lynxcgi 功能。"
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "抱歉，没办法将 %s 转换为 %s 。"
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "无法建立转换"
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "无法完成转换"
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr ""
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr ""
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr ""
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr ""
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr ""
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr ""
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr ""
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr ""
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr ""
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr ""
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr ""
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr ""
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr ""
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr ""
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr ""
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr ""
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr ""
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr ""
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr ""
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr ""
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr ""
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr ""
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr ""
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr ""
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr ""
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr ""
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr ""
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr ""
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr ""
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr ""
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr ""
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr ""
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr ""
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr ""
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr ""
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr ""
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr ""
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr ""
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr ""
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr ""
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr ""
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr ""
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr ""
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr ""
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr ""
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr ""
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr ""
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr ""
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr ""
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr ""
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr ""
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr ""
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr ""
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr ""
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr ""
+
+#: LYMessages.c:554
+msgid " first"
+msgstr ""
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ""
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr ""
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr ""
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr ""
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr ""
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr ""
+
+#: LYMessages.c:561
+msgid " to "
+msgstr ""
+
+#: LYMessages.c:562
+msgid " or "
+msgstr ""
+
+#: LYMessages.c:563
+msgid " index"
+msgstr ""
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr ""
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr ""
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr ""
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr ""
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr ""
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr ""
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr ""
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr ""
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr ""
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr ""
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr ""
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr ""
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr ""
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr ""
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr ""
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr ""
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr ""
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr ""
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr ""
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr ""
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr ""
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr ""
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr ""
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr ""
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr ""
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr ""
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr ""
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr ""
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr ""
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr ""
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr ""
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr ""
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr ""
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr ""
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr ""
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr ""
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr ""
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr ""
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr ""
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr ""
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr ""
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr ""
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr ""
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr ""
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr ""
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr ""
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr ""
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr ""
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr ""
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr ""
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr ""
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr ""
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr ""
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr ""
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr ""
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr ""
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr ""
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr ""
+
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr ""
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr ""
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr ""
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr ""
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr ""
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr ""
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr ""
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr ""
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr ""
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr ""
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr ""
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr ""
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr ""
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr ""
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr ""
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr ""
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr ""
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr ""
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr ""
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr ""
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr ""
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr ""
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr ""
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr ""
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr ""
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr ""
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr ""
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr ""
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr ""
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr ""
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr ""
+
+#: LYMessages.c:713
+msgid "None"
+msgstr ""
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr ""
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr ""
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr ""
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr ""
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr ""
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr ""
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr ""
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr ""
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr ""
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr ""
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr ""
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr ""
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr ""
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr ""
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr ""
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr ""
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr ""
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr ""
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr ""
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr ""
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr ""
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr ""
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr ""
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr ""
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr ""
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr ""
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr ""
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr ""
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr ""
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr ""
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr ""
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr ""
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr ""
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr ""
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr ""
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr ""
+
+#: LYMessages.c:758
+msgid "Up to "
+msgstr ""
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr ""
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr ""
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr ""
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr ""
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr ""
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr ""
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr ""
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr ""
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr ""
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr ""
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr ""
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr ""
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr ""
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr ""
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr ""
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr ""
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr ""
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr ""
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr ""
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr ""
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr ""
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr ""
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr ""
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr ""
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr ""
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr ""
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr ""
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr ""
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr ""
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr ""
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr ""
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr ""
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr ""
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr ""
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr ""
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr ""
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr ""
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr ""
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr ""
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr ""
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr ""
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr ""
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr ""
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr ""
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr ""
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr ""
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr ""
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr ""
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr ""
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr ""
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr ""
+
+#: LYMessages.c:829
+msgid "your"
+msgstr ""
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr ""
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr ""
+
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr ""
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr ""
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr ""
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr ""
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+msgid ""
+"The following data were derived during the automatic configuration/build\n"
+"process of this copy of Lynx.  When reporting a bug, please include a copy\n"
+"of this page."
+msgstr ""
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr ""
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr ""
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr ""
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr ""
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr ""
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr ""
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr ""
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr ""
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr ""
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr ""
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1020 src/GridText.c:8326
+msgid "Loading incomplete."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1050
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1052
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1053
+#, c-format
+msgid "**** HTAccess: Status returned was: %d\n"
+msgstr ""
+
+#.
+#. * hack: if we fail in HTAccess.c
+#. * avoid duplicating URL, oh.
+#.
+#: WWW/Library/Implementation/HTAccess.c:1059 src/LYMainLoop.c:7769
+msgid "Can't Access"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1067
+msgid "Unable to access document."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:749
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:777
+msgid "Unable to connect to FTP host."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:1047
+msgid "close master socket"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:1109
+msgid "socket for master socket"
+msgstr ""
+
+#.
+#. **  It's a symbolic link, does the user care about
+#. **  knowing if it is symbolic?	I think so since
+#. **  it might be a directory.
+#.
+#: WWW/Library/Implementation/HTFTP.c:1623 WWW/Library/Implementation/HTFTP.c:2244
+msgid "Symbolic Link"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:2605
+msgid "Receiving FTP directory."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:2745
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:3082
+msgid "connect for data"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:3682
+msgid "Receiving FTP file."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:369
+#, c-format
+msgid "Username for news host '%s':"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:422
+msgid "Change username?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:426
+msgid "Username:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:450
+#, c-format
+msgid "Password for news host '%s':"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:533
+msgid "Change password?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1687
+#, c-format
+msgid "No matches for: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1740
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1753
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1766
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1788
+msgid "Earlier articles"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1801
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1861
+msgid "All available articles in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2077
+msgid "Later articles"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2101
+msgid "Post to "
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2319
+msgid "This client does not contain support for SNEWS URLs."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2527
+msgid "No target for raw text!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2557
+msgid "Connecting to NewsHost ..."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2608
+#, c-format
+msgid "Could not access %s."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2708
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2712
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr ""
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2916
+msgid "Reading list of available newsgroups."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2938
+msgid "Reading list of articles in newsgroup."
+msgstr ""
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2944
+msgid "Reading news article."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2974
+msgid "Sorry, could not load requested news."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1247
+msgid "Address has invalid port"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1335
+msgid "Address length looks invalid"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1568 WWW/Library/Implementation/HTTCP.c:1586
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr ""
+
+#. Not HTProgress, so warning won't be overwritten
+#. *  immediately; but not HTAlert, because typically
+#. *  there will be other alerts from the callers. - kw
+#.
+#: WWW/Library/Implementation/HTTCP.c:1583 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1597
+#, c-format
+msgid "Making %s connection to %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1613
+#, c-format
+msgid "socket failed: family %d addr %s port %s."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1622
+msgid "socket failed."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1642
+msgid "Could not make connection non-blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1711
+msgid "Connection failed (too many retries)."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1904
+msgid "Could not restore socket to blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1970
+msgid "Socket read failed for 180,000 tries."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:349
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:502
+msgid "This client does not contain support for HTTPS URLs."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:527
+msgid "Unable to connect to remote host."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:556
+msgid "Retrying connection without TLS."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:597
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:610
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:622
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1086
+msgid "Sending HTTP request."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1120
+msgid "Unexpected network write error; connection aborted."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1126
+msgid "HTTP request sent; waiting for response."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1190
+msgid "Unexpected network read error; connection aborted."
+msgstr ""
+
+#.
+#. **	HTTP/1.1 Informational statuses.
+#. **	100 Continue.
+#. **	101 Switching Protocols.
+#. **	> 101 is unknown.
+#. **	We should never get these, and they have only
+#. **	the status line and possibly other headers,
+#. **	so we'll deal with them by showing the full
+#. **	header to the user as text/plain. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1386
+msgid "Got unexpected Informational Status."
+msgstr ""
+
+#.
+#. *  Reset Content.  The server has fulfilled the
+#. *  request but nothing is returned and we should
+#. *  reset any form content.  We'll instruct the
+#. *  user to do that, and restore the current
+#. *  document. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1421
+msgid "Request fulfilled.  Reset Content."
+msgstr ""
+
+#. Not Modified
+#.
+#. *  We didn't send an "If-Modified-Since" header,
+#. *  so this status is inappropriate.  We'll deal
+#. *  with it by showing the full header to the user
+#. *  as text/plain. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1540
+msgid "Got unexpected 304 Not Modified status."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1607
+msgid "Redirection of POST content requires user approval."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1622
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1667
+msgid "Retrying with access authorization information."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1679
+msgid "Show the 401 message body?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1724
+msgid "Show the 407 message body?"
+msgstr ""
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1829
+msgid "Unknown status reply from server!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr ""
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr ""
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr ""
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr ""
+
+#: src/GridText.c:676
+msgid "Memory exhausted, display interrupted!"
+msgstr ""
+
+#: src/GridText.c:681
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr ""
+
+#: src/GridText.c:3519
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr ""
+
+#: src/GridText.c:6014 src/GridText.c:6021 src/LYList.c:252
+msgid "unknown field or link"
+msgstr ""
+
+#: src/GridText.c:6030
+msgid "text entry field"
+msgstr ""
+
+#: src/GridText.c:6033
+msgid "password entry field"
+msgstr ""
+
+#: src/GridText.c:6036
+msgid "checkbox"
+msgstr ""
+
+#: src/GridText.c:6039
+msgid "radio button"
+msgstr ""
+
+#: src/GridText.c:6042
+msgid "submit button"
+msgstr ""
+
+#: src/GridText.c:6045
+msgid "reset button"
+msgstr ""
+
+#: src/GridText.c:6048
+msgid "popup menu"
+msgstr ""
+
+#: src/GridText.c:6051
+msgid "hidden form field"
+msgstr ""
+
+#: src/GridText.c:6054
+msgid "text entry area"
+msgstr ""
+
+#: src/GridText.c:6057
+msgid "range entry field"
+msgstr ""
+
+#: src/GridText.c:6060
+msgid "file entry field"
+msgstr ""
+
+#: src/GridText.c:6063
+msgid "text-submit field"
+msgstr ""
+
+#: src/GridText.c:6066
+msgid "image-submit button"
+msgstr ""
+
+#: src/GridText.c:6069
+msgid "keygen field"
+msgstr ""
+
+#: src/GridText.c:6072
+msgid "unknown form field"
+msgstr ""
+
+#: src/GridText.c:10103
+msgid "Can't open file for uploading"
+msgstr ""
+
+#: src/GridText.c:11249
+#, c-format
+msgid "Submitting %s"
+msgstr ""
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12385
+msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
+msgstr ""
+
+#. don't show previous state
+#: src/GridText.c:12591
+msgid "Wrap lines to fit displayed area?"
+msgstr ""
+
+#: src/GridText.c:12643
+msgid "Very long lines have been wrapped!"
+msgstr ""
+
+#: src/GridText.c:13089
+msgid "Very long lines have been truncated!"
+msgstr ""
+
+#: src/HTAlert.c:159 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr ""
+
+#: src/HTAlert.c:160
+msgid "KB"
+msgstr ""
+
+#: src/HTAlert.c:279
+#, c-format
+msgid "Read %s of %s of data"
+msgstr ""
+
+#: src/HTAlert.c:281
+#, c-format
+msgid "Read %s of data"
+msgstr ""
+
+#: src/HTAlert.c:286
+#, c-format
+msgid ", %s/sec"
+msgstr ""
+
+#: src/HTAlert.c:295
+#, c-format
+msgid " (stalled for %s)"
+msgstr ""
+
+#: src/HTAlert.c:299
+#, c-format
+msgid ", ETA %s"
+msgstr ""
+
+#: src/HTAlert.c:306
+msgid " (Press 'z' to abort)"
+msgstr ""
+
+#. Meta-note: don't move the following note from its place right
+#. in front of the first gettext().  As it is now, it should
+#. automatically appear in generated lynx.pot files. - kw
+#.
+#. NOTE TO TRANSLATORS:  If you provide a translation for "yes", lynx
+#. *  will take the first byte of the translation as a positive response
+#. *  to Yes/No questions.  If you provide a translation for "no", lynx
+#. *  will take the first byte of the translation as a negative response
+#. *  to Yes/No questions.  For both, lynx will also try to show the
+#. *  first byte in the prompt as a character, instead of (y) or (n),
+#. *  respectively.  This will not work right for multibyte charsets!
+#. *  Don't translate "yes" and "no" for CJK character sets (or translate
+#. *  them to "yes" and "no").  For a translation using UTF-8, don't
+#. *  translate if the translation would begin with anything but a 7-bit
+#. *  (US_ASCII) character.  That also means do not translate if the
+#. *  translation would begin with anything but a 7-bit character, if
+#. *  you use a single-byte character encoding (a charset like ISO-8859-n)
+#. *  but anticipate that the message catalog may be used re-encoded in
+#. *  UTF-8 form.
+#. *  For translations using other character sets, you may also wish to
+#. *  leave "yes" and "no" untranslated, if using (y) and (n) is the
+#. *  preferred behavior.
+#. *  Lynx will also accept y Y n N as responses unless there is a conflict
+#. *  with the first letter of the "yes" or "no" translation.
+#.
+#: src/HTAlert.c:363
+msgid "yes"
+msgstr ""
+
+#: src/HTAlert.c:364
+msgid "no"
+msgstr ""
+
+#: src/HTML.c:5995
+msgid "Description:"
+msgstr ""
+
+#: src/HTML.c:6000
+msgid "(none)"
+msgstr ""
+
+#: src/HTML.c:6004
+msgid "Filepath:"
+msgstr ""
+
+#: src/HTML.c:6009
+msgid "(unknown)"
+msgstr ""
+
+#: src/HTML.c:7462
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr ""
+
+#: src/HTML.c:7968
+msgid "Source cache error - disk full?"
+msgstr ""
+
+#: src/HTML.c:7981
+msgid "Source cache error - not enough memory!"
+msgstr ""
+
+#: src/LYBookmark.c:167
+msgid ""
+"     This file is an HTML representation of the X Mosaic hotlist file.\n"
+"     Outdated or invalid links may be removed by using the\n"
+"     remove bookmark command, it is usually the 'R' key but may have\n"
+"     been remapped by you or your system administrator."
+msgstr ""
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+
+#: src/LYBookmark.c:382
+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."
+msgstr ""
+
+#: src/LYBookmark.c:386
+msgid ""
+"     This file also may be edited with a standard text editor to delete\n"
+"     outdated or invalid links, or to change their order."
+msgstr ""
+
+#: src/LYBookmark.c:389
+msgid ""
+"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 is saved as a single line."
+msgstr ""
+
+#: src/LYBookmark.c:683
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr ""
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr ""
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr ""
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr ""
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr ""
+
+#: src/LYCgi.c:671
+msgid "It provides state of the art CGI script support.\n"
+msgstr ""
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr ""
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr ""
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr ""
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr ""
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr ""
+
+#: src/LYCurses.c:975
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr ""
+
+#: src/LYCurses.c:1368
+msgid "Terminal ="
+msgstr ""
+
+#: src/LYCurses.c:1372
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr ""
+
+#: src/LYCurses.c:1422
+msgid "Your Terminal type is unknown!"
+msgstr ""
+
+#: src/LYCurses.c:1423
+msgid "Enter a terminal type:"
+msgstr ""
+
+#: src/LYCurses.c:1437
+msgid "TERMINAL TYPE IS SET TO"
+msgstr ""
+
+#: src/LYCurses.c:1936
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+
+#: src/LYCurses.c:1938
+msgid ""
+"\n"
+"Please notify your system administrator to confirm a bug, and if\n"
+"confirmed, to notify the lynx-dev list.  Bug reports should have concise\n"
+"descriptions of the command and/or URL which causes the problem, the\n"
+"operating system name with version number, the TCPIP implementation, the\n"
+"TRACEBACK if it can be captured, and any other relevant information.\n"
+msgstr ""
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr ""
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr ""
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr ""
+
+#: src/LYDownload.c:504
+msgid "Downloaded link:"
+msgstr ""
+
+#: src/LYDownload.c:509
+msgid "Suggested file name:"
+msgstr ""
+
+#: src/LYDownload.c:514
+msgid "Standard download options:"
+msgstr ""
+
+#: src/LYDownload.c:515
+msgid "Download options:"
+msgstr ""
+
+#: src/LYDownload.c:530
+msgid "Save to disk"
+msgstr ""
+
+#: src/LYDownload.c:532
+msgid "Save to disk disabled."
+msgstr ""
+
+#: src/LYDownload.c:536 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr ""
+
+#: src/LYDownload.c:545 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr ""
+
+#: src/LYHistory.c:659
+msgid "You selected:"
+msgstr ""
+
+#: src/LYHistory.c:683 src/LYHistory.c:923
+msgid "(no address)"
+msgstr ""
+
+#: src/LYHistory.c:687
+msgid " (internal)"
+msgstr ""
+
+#: src/LYHistory.c:689
+msgid " (was internal)"
+msgstr ""
+
+#: src/LYHistory.c:787
+msgid " (From History)"
+msgstr ""
+
+#: src/LYHistory.c:843
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr ""
+
+#: src/LYHistory.c:1139
+msgid "(No messages yet)"
+msgstr ""
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr ""
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr ""
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr ""
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr ""
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr ""
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr ""
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr ""
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr ""
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr ""
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr ""
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr ""
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr ""
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr ""
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr ""
+
+#: src/LYList.c:262
+msgid "References"
+msgstr ""
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr ""
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr ""
+
+#: src/LYLocal.c:301
+msgid "The selected item is not a file or a directory!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr ""
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr ""
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr ""
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr ""
+
+#: src/LYLocal.c:548
+msgid "There is already a directory with that name!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:550
+msgid "There is already a file with that name!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr ""
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr ""
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr ""
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr ""
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr ""
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr ""
+
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr ""
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr ""
+
+#: src/LYLocal.c:819
+msgid "Illegal character (path-separator) found! Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:868
+msgid "Enter new location for directory: "
+msgstr ""
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr ""
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr ""
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr ""
+
+#: src/LYLocal.c:970
+msgid "Modify name, location, or permission (n, l, or p): "
+msgstr ""
+
+#: src/LYLocal.c:972
+msgid "Modify name or location (n or l): "
+msgstr ""
+
+#.
+#. *	Code for changing ownership needed here.
+#.
+#: src/LYLocal.c:1001
+msgid "This feature not yet implemented!"
+msgstr ""
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr ""
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr ""
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr ""
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr ""
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr ""
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr ""
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr ""
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr ""
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr ""
+
+#: src/LYLocal.c:1248
+msgid "Sorry, don't know how to permit non-UNIX files yet."
+msgstr ""
+
+#: src/LYLocal.c:1278
+msgid "Unable to open permit options file"
+msgstr ""
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr ""
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr ""
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr ""
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr ""
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr ""
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr ""
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr ""
+
+#: src/LYLocal.c:1645
+msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
+msgstr ""
+
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr ""
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr ""
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr ""
+
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr ""
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr ""
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr ""
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr ""
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr ""
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr ""
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr ""
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:2276
+msgid "Just a moment, ..."
+msgstr ""
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr ""
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr ""
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr ""
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr ""
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr ""
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr ""
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr ""
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr ""
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr ""
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr ""
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:912
+msgid "No Winsock found, sorry."
+msgstr ""
+
+#: src/LYMain.c:1116
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr ""
+
+#: src/LYMain.c:1170 src/LYMainLoop.c:5062
+msgid "No such directory"
+msgstr ""
+
+#: src/LYMain.c:1382
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1392
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1421
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1450
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1689
+msgid "Warning:"
+msgstr ""
+
+#: src/LYMain.c:2230
+msgid "persistent cookies state will be changed in next session only."
+msgstr ""
+
+#: src/LYMain.c:2474 src/LYMain.c:2522
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr ""
+
+#: src/LYMain.c:3057
+#, c-format
+msgid "%s Version %s (%s)\n"
+msgstr ""
+
+#: src/LYMain.c:3082
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr ""
+
+#: src/LYMain.c:3087
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr ""
+
+#: src/LYMain.c:3089
+msgid "Distributed under the GNU General Public License.\n"
+msgstr ""
+
+#: src/LYMain.c:3091
+msgid ""
+"See http://lynx.browser.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:3830
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr ""
+
+#: src/LYMain.c:3831
+msgid "Options are:\n"
+msgstr ""
+
+#: src/LYMain.c:4090
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr ""
+
+#: src/LYMainLoop.c:555
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr ""
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:669 src/LYMainLoop.c:5084
+msgid "A URL specified by the user"
+msgstr ""
+
+#: src/LYMainLoop.c:1126
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr ""
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3072
+msgid "Help Screen"
+msgstr ""
+
+#: src/LYMainLoop.c:3202
+msgid "System Index"
+msgstr ""
+
+#: src/LYMainLoop.c:3577 src/LYMainLoop.c:5304
+msgid "Entry into main screen"
+msgstr ""
+
+#: src/LYMainLoop.c:3855
+msgid "No next document present"
+msgstr ""
+
+#: src/LYMainLoop.c:4162
+msgid "charset for this document specified explicitly, sorry..."
+msgstr ""
+
+#: src/LYMainLoop.c:5038
+msgid "cd to:"
+msgstr ""
+
+#: src/LYMainLoop.c:5065
+msgid "A component of path is not a directory"
+msgstr ""
+
+#: src/LYMainLoop.c:5068
+msgid "failed to change directory"
+msgstr ""
+
+#: src/LYMainLoop.c:6238
+msgid "Reparsing document under current settings..."
+msgstr ""
+
+#: src/LYMainLoop.c:6526 src/LYMainLoop.c:6530
+#, c-format
+msgid "Fatal error - could not open output file %s\n"
+msgstr ""
+
+#: src/LYMainLoop.c:6872
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6875
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6952
+msgid "Current URL is empty."
+msgstr ""
+
+#: src/LYMainLoop.c:6954 src/LYUtils.c:1661
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6956
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6958
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6979
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7654 src/LYMainLoop.c:7827
+msgid "-index-"
+msgstr ""
+
+#: src/LYMainLoop.c:7764
+msgid "lynx: Can't access startfile"
+msgstr ""
+
+#: src/LYMainLoop.c:7777
+msgid "lynx: Start file could not be found or is not text/html or text/plain"
+msgstr ""
+
+#: src/LYMainLoop.c:7778
+msgid "      Exiting..."
+msgstr ""
+
+#: src/LYMainLoop.c:7821
+msgid "-more-"
+msgstr ""
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr ""
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+msgstr ""
+
+#.
+#. *  Get the Subject header, offering the current
+#. *  document's title as the default if this is a
+#. *  followup rather than a new post. - FM
+#.
+#: src/LYNews.c:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr ""
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr ""
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr ""
+
+#: src/LYOptions.c:2532 src/LYOptions.c:2556
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr ""
+
+#: src/LYOptions.c:3230
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3238
+msgid "General Preferences"
+msgstr ""
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3242
+msgid "User mode"
+msgstr ""
+
+#. Editor: INPUT
+#: src/LYOptions.c:3248
+msgid "Editor"
+msgstr ""
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3253
+msgid "Type of Search"
+msgstr ""
+
+#. Cookies: SELECT
+#: src/LYOptions.c:3259
+msgid "Cookies"
+msgstr ""
+
+#: src/LYOptions.c:3273
+msgid "Keyboard Input"
+msgstr ""
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3277
+msgid "Keypad mode"
+msgstr ""
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3283
+msgid "Emacs keys"
+msgstr ""
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3289
+msgid "VI keys"
+msgstr ""
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3296
+msgid "Line edit style"
+msgstr ""
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3308
+msgid "Keyboard layout"
+msgstr ""
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3321
+msgid "Display and Character Set"
+msgstr ""
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3325
+msgid "Display character set"
+msgstr ""
+
+#: src/LYOptions.c:3354
+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:3374
+msgid "CJK mode"
+msgstr ""
+
+#: src/LYOptions.c:3376
+msgid "Raw 8-bit"
+msgstr ""
+
+#. X Display: INPUT
+#: src/LYOptions.c:3384
+msgid "X Display"
+msgstr ""
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3390
+msgid "Document Appearance"
+msgstr ""
+
+#: src/LYOptions.c:3396
+msgid "Show color"
+msgstr ""
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3420
+msgid "Show cursor"
+msgstr ""
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3427
+msgid "Show scrollbar"
+msgstr ""
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3434
+msgid "Popups for select fields"
+msgstr ""
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3440
+msgid "HTML error recovery"
+msgstr ""
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3446
+msgid "Show images"
+msgstr ""
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3460
+msgid "Verbose images"
+msgstr ""
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3468
+msgid "Headers Transferred to Remote Servers"
+msgstr ""
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3472
+msgid "Personal mail address"
+msgstr ""
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3477
+msgid "Preferred document character set"
+msgstr ""
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3482
+msgid "Preferred document language"
+msgstr ""
+
+#: src/LYOptions.c:3488
+msgid "User-Agent header"
+msgstr ""
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3496
+msgid "Listing and Accessing Files"
+msgstr ""
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3500
+msgid "FTP sort criteria"
+msgstr ""
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3507
+msgid "Local directory sort criteria"
+msgstr ""
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3513
+msgid "Local directory sort order"
+msgstr ""
+
+#: src/LYOptions.c:3522
+msgid "Show dot files"
+msgstr ""
+
+#: src/LYOptions.c:3530
+msgid "Execution links"
+msgstr ""
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3550
+msgid "Show transfer rate"
+msgstr ""
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3559
+msgid "Special Files and Screens"
+msgstr ""
+
+#: src/LYOptions.c:3564
+msgid "Multi-bookmarks"
+msgstr ""
+
+#: src/LYOptions.c:3572
+msgid "Review/edit Bookmarks files"
+msgstr ""
+
+#: src/LYOptions.c:3574
+msgid "Goto multi-bookmark menu"
+msgstr ""
+
+#: src/LYOptions.c:3576
+msgid "Bookmarks file"
+msgstr ""
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3582
+msgid "Visited Pages"
+msgstr ""
+
+#: src/LYOptions.c:3589
+msgid "View the file "
+msgstr ""
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr ""
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr ""
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr ""
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr ""
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr ""
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr ""
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr ""
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr ""
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr ""
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr ""
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr ""
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr ""
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr ""
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr ""
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr ""
+
+#: src/LYReadCFG.c:339
+msgid ""
+"Syntax Error parsing COLOR in configuration file:\n"
+"The line must be of the form:\n"
+"COLOR:INTEGER:FOREGROUND:BACKGROUND\n"
+"\n"
+"Here FOREGROUND and BACKGROUND must be one of:\n"
+"The special strings 'nocolor' or 'default', or\n"
+msgstr ""
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr ""
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr ""
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr ""
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr ""
+
+#: src/LYReadCFG.c:1751
+#, c-format
+msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1753
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1754
+#, c-format
+msgid "included from '%s'.\n"
+msgstr ""
+
+#: src/LYReadCFG.c:2160 src/LYReadCFG.c:2173 src/LYReadCFG.c:2231
+msgid "The following is read from your lynx.cfg file."
+msgstr ""
+
+#: src/LYReadCFG.c:2161 src/LYReadCFG.c:2174
+msgid "Please read the distribution"
+msgstr ""
+
+#: src/LYReadCFG.c:2167 src/LYReadCFG.c:2177
+msgid "for more comments."
+msgstr ""
+
+#: src/LYReadCFG.c:2213
+msgid "RELOAD THE CHANGES"
+msgstr ""
+
+#: src/LYReadCFG.c:2222
+msgid "Your primary configuration"
+msgstr ""
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr ""
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr ""
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr ""
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr ""
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr ""
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr ""
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr ""
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr ""
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr ""
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr ""
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr ""
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr ""
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr ""
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr ""
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr ""
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr ""
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr ""
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr ""
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr ""
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr ""
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr ""
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr ""
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr ""
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr ""
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr ""
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr ""
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr ""
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr ""
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr ""
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr ""
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ""
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ""
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ""
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ""
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ""
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr ""
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr ""
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr ""
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr ""
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr ""
+
+#: src/LYStyle.c:274
+#, c-format
+msgid ""
+"Syntax Error parsing style in lss file:\n"
+"[%s]\n"
+"The line must be of the form:\n"
+"OBJECT:MONO:COLOR (ie em:bold:brightblue:white)\n"
+"where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n"
+"\n"
+msgstr ""
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr ""
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr ""
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr ""
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr ""
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr ""
+
+#: src/LYUtils.c:1663
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2441
+msgid "Unexpected access protocol for this URL scheme."
+msgstr ""
+
+#: src/LYUtils.c:3267
+msgid "Too many tempfiles"
+msgstr ""
+
+#: src/LYUtils.c:3568
+msgid "unknown restriction"
+msgstr ""
+
+#: src/LYUtils.c:3599
+msgid "No restrictions set.\n"
+msgstr ""
+
+#: src/LYUtils.c:3602
+msgid "Restrictions set:\n"
+msgstr ""
+
+#: src/LYUtils.c:5007
+msgid "Cannot find HOME directory"
+msgstr ""
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr ""
+
+#: src/LYrcFile.c:288
+msgid ""
+"accept_all_cookies allows the user to tell Lynx to automatically\n"
+"accept all cookies if desired.  The default is \"FALSE\" which will\n"
+"prompt for each cookie.  Set accept_all_cookies to \"TRUE\" to accept\n"
+"all cookies.\n"
+msgstr ""
+
+#: src/LYrcFile.c:295
+msgid ""
+"bookmark_file specifies the name and location of the default bookmark\n"
+"file into which the user can paste links for easy access at a later\n"
+"date.\n"
+msgstr ""
+
+#: src/LYrcFile.c:300
+msgid ""
+"If case_sensitive_searching is \"on\" then when the user invokes a search\n"
+"using the 's' or '/' keys, the search performed will be case sensitive\n"
+"instead of case INsensitive.  The default is usually \"off\".\n"
+msgstr ""
+
+#: src/LYrcFile.c:305
+msgid ""
+"The character_set definition controls the representation of 8 bit\n"
+"characters for your terminal.  If 8 bit characters do not show up\n"
+"correctly on your screen you may try changing to a different 8 bit\n"
+"set or using the 7 bit character approximations.\n"
+"Current valid characters sets are:\n"
+msgstr ""
+
+#: src/LYrcFile.c:312
+msgid ""
+"cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
+"lists of domains from which Lynx should automatically accept or reject\n"
+"all cookies.  If a domain is specified in both options, rejection will\n"
+"take precedence.  The accept_all_cookies parameter will override any\n"
+"settings made here.\n"
+msgstr ""
+
+#: src/LYrcFile.c:320
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+
+#: src/LYrcFile.c:325
+msgid ""
+"cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
+"cookie_query_invalid_domains are comma-delimited lists of which domains\n"
+"should be subjected to varying degrees of validity checking.  If a\n"
+"domain is set to strict checking, strict conformance to RFC2109 will\n"
+"be applied.  A domain with loose checking will be allowed to set cookies\n"
+"with an invalid path or domain attribute.  All domains will default to\n"
+"querying the user for an invalid path or domain.\n"
+msgstr ""
+
+#: src/LYrcFile.c:339
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:344
+msgid ""
+"dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
+"files and directories together.  \"FILES_FIRST\" lists files first and\n"
+"\"DIRECTORIES_FIRST\" lists directories first.\n"
+msgstr ""
+
+#: src/LYrcFile.c:352
+msgid ""
+"If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
+"  ^N = down    ^P = up\n"
+"  ^B = left    ^F = right\n"
+"will be enabled.\n"
+msgstr ""
+
+#: src/LYrcFile.c:358
+msgid ""
+"file_editor specifies the editor to be invoked when editing local files\n"
+"or sending mail.  If no editor is specified, then file editing is disabled\n"
+"unless it is activated from the command line, and the built-in line editor\n"
+"will be used for sending mail.\n"
+msgstr ""
+
+#: src/LYrcFile.c:364
+msgid ""
+"The file_sorting_method specifies which value to sort on when viewing\n"
+"file lists such as FTP directories.  The options are:\n"
+"   BY_FILENAME -- sorts on the name of the file\n"
+"   BY_TYPE     -- sorts on the type of the file\n"
+"   BY_SIZE     -- sorts on the size of the file\n"
+"   BY_DATE     -- sorts on the date of the file\n"
+msgstr ""
+
+#: src/LYrcFile.c:376
+msgid ""
+"lineedit_mode specifies the key binding used for inputting strings in\n"
+"prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
+"the following control characters are used for moving and deleting:\n"
+"\n"
+"             Prev  Next       Enter = Accept input\n"
+"   Move char: <-    ->        ^G    = Cancel input\n"
+"   Move word: ^P    ^N        ^U    = Erase line\n"
+" Delete char: ^H    ^R        ^A    = Beginning of line\n"
+" Delete word: ^B    ^F        ^E    = End of line\n"
+"\n"
+"Current lineedit modes are:\n"
+msgstr ""
+
+#: src/LYrcFile.c:391
+msgid ""
+"The following allow you to define sub-bookmark files and descriptions.\n"
+"The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
+"Up to 26 bookmark files (for the English capital letters) are allowed.\n"
+"We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n"
+msgstr ""
+
+#: src/LYrcFile.c:397
+msgid ""
+"personal_mail_address specifies your personal mail address.  The\n"
+"address will be sent during HTTP file transfers for authorization and\n"
+"logging purposes, and for mailed comments.\n"
+"If you do not want this information given out, set the NO_FROM_HEADER\n"
+"to TRUE in lynx.cfg, or use the -nofrom command line switch.  You also\n"
+"could leave this field blank, but then you won't have it included in\n"
+"your mailed comments.\n"
+msgstr ""
+
+#: src/LYrcFile.c:406
+msgid ""
+"preferred_charset specifies the character set in MIME notation (e.g.,\n"
+"ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
+"to http servers using an Accept-Charset header.  The value should NOT\n"
+"include ISO-8859-1 or US-ASCII, since those values are always assumed\n"
+"by default.  May be a comma-separated list.\n"
+"If a file in that character set is available, the server will send it.\n"
+"If no Accept-Charset header is present, the default is that any\n"
+"character set is acceptable.  If an Accept-Charset header is present,\n"
+"and if the server cannot send a response which is acceptable\n"
+"according to the Accept-Charset header, then the server SHOULD send\n"
+"an error response, though the sending of an unacceptable response\n"
+"is also allowed.\n"
+msgstr ""
+
+#: src/LYrcFile.c:420
+msgid ""
+"preferred_language specifies the language in MIME notation (e.g., en,\n"
+"fr, may be a comma-separated list in decreasing preference)\n"
+"which Lynx will indicate you prefer in requests to http servers.\n"
+"If a file in that language is available, the server will send it.\n"
+"Otherwise, the server will send the file in its default language.\n"
+msgstr ""
+
+#: src/LYrcFile.c:429
+msgid ""
+"If run_all_execution_links is set \"on\" then all local execution links\n"
+"will be executed when they are selected.\n"
+"\n"
+"WARNING - This is potentially VERY 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 ""
+
+#: src/LYrcFile.c:440
+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 ""
+
+#: src/LYrcFile.c:458
+msgid ""
+"select_popups specifies whether the OPTIONs in a SELECT block which\n"
+"lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
+"buttons or via a popup menu.  Note that if the MULTIPLE attribute is\n"
+"present in the SELECT start tag, Lynx always will create a vertical list\n"
+"of checkboxes for the OPTIONs.  A value of \"on\" will set popup menus\n"
+"as the default while a value of \"off\" will set use of radio boxes.\n"
+"The default can be overridden via the -popup command line toggle.\n"
+msgstr ""
+
+#: src/LYrcFile.c:468
+msgid ""
+"show_color specifies how to set the color mode at startup.  A value of\n"
+"\"never\" will force color mode off (treat the terminal as monochrome)\n"
+"at startup even if the terminal appears to be color capable.  A value of\n"
+"\"always\" will force color mode on even if the terminal appears to be\n"
+"monochrome, if this is supported by the library used to build lynx.\n"
+"A value of \"default\" will yield the behavior of assuming\n"
+"a monochrome terminal unless color capability is inferred at startup\n"
+"based on the terminal type, or the -color command line switch is used, or\n"
+"the COLORTERM environment variable is set.  The default behavior always is\n"
+"used in anonymous accounts or if the \"option_save\" restriction is set.\n"
+"The effect of the saved value can be overridden via\n"
+"the -color and -nocolor command line switches.\n"
+"The mode set at startup can be changed via the \"show color\" option in\n"
+"the 'o'ptions menu.  If the option settings are saved, the \"on\" and\n"
+"\"off\" \"show color\" settings will be treated as \"default\".\n"
+msgstr ""
+
+#: src/LYrcFile.c:485
+msgid ""
+"show_cursor specifies whether to 'hide' the cursor to the right (and\n"
+"bottom, if possible) of the screen, or to place it to the left of the\n"
+"current link in documents, or current option in select popup windows.\n"
+"Positioning the cursor to the left of the current link or option is\n"
+"helpful for speech or braille interfaces, and when the terminal is\n"
+"one which does not distinguish the current link based on highlighting\n"
+"or color.  A value of \"on\" will set positioning to the left as the\n"
+"default while a value of \"off\" will set 'hiding' of the cursor.\n"
+"The default can be overridden via the -show_cursor command line toggle.\n"
+msgstr ""
+
+#: src/LYrcFile.c:496
+msgid ""
+"show_dotfiles specifies that the directory listing should include\n"
+"\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
+"honored only if enabled via userdefs.h and/or lynx.cfg, and not\n"
+"restricted via a command line switch.  If display of hidden files\n"
+"is disabled, creation of such files via Lynx also is disabled.\n"
+msgstr ""
+
+#: src/LYrcFile.c:507
+msgid ""
+"If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
+"been defined (see below), then all bookmark operations will first\n"
+"prompt the user to select an active sub-bookmark file.  If the default\n"
+"Lynx bookmark_file is defined (see above), it will be used as the\n"
+"default selection.  When this option is set to \"advanced\", and the\n"
+"user mode is advanced, the 'v'iew bookmark command will invoke a\n"
+"statusline prompt instead of the menu seen in novice and intermediate\n"
+"user modes.  When this option is set to \"standard\", the menu will be\n"
+"presented regardless of user mode.\n"
+msgstr ""
+
+#: src/LYrcFile.c:520
+msgid ""
+"user_mode specifies the users level of knowledge with Lynx.  The\n"
+"default is \"NOVICE\" which displays two extra lines of help at the\n"
+"bottom of the screen to aid the user in learning the basic Lynx\n"
+"commands.  Set user_mode to \"INTERMEDIATE\" to turn off the extra info.\n"
+"Use \"ADVANCED\" to see the URL of the currently selected link at the\n"
+"bottom of the screen.\n"
+msgstr ""
+
+#: src/LYrcFile.c:529
+msgid ""
+"If verbose_images is \"on\", lynx will print the name of the image\n"
+"source file in place of [INLINE], [LINK] or [IMAGE]\n"
+"See also VERBOSE_IMAGES in lynx.cfg\n"
+msgstr ""
+
+#: src/LYrcFile.c:534
+msgid ""
+"If vi_keys is set to \"on\", then the normal VI movement keys:\n"
+"  j = down    k = up\n"
+"  h = left    l = right\n"
+"will be enabled.  These keys are only lower case.\n"
+"Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n"
+"and the keymap display, respectively.\n"
+msgstr ""
+
+#: src/LYrcFile.c:542
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+
+#: src/LYrcFile.c:759
+msgid ""
+"If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
+"your keypad when the numlock is on will act as arrow keys:\n"
+"            8 = Up Arrow\n"
+"  4 = Left Arrow    6 = Right Arrow\n"
+"            2 = Down Arrow\n"
+"and the corresponding keyboard numbers will act as arrow keys,\n"
+"regardless of whether numlock is on.\n"
+msgstr ""
+
+#: src/LYrcFile.c:768
+msgid ""
+"If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
+"appear next to each link and numbers are used to select links.\n"
+msgstr ""
+
+#: src/LYrcFile.c:772
+msgid ""
+"If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
+"numbers will appear next to each link and visible form input field.\n"
+"Numbers are used to select links, or to move the \"current link\" to a\n"
+"form input field or button.  In addition, options in popup menus are\n"
+"indexed so that the user may type an option number to select an option in\n"
+"a popup menu, even if the option isn't visible on the screen.  Reference\n"
+"lists and output from the list command also enumerate form inputs.\n"
+msgstr ""
+
+#: src/LYrcFile.c:781
+msgid ""
+"NOTE: Some fixed format documents may look disfigured when\n"
+"\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
+"enabled.\n"
+msgstr ""
+
+#: src/LYrcFile.c:814
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
diff --git a/src/GridText.c b/src/GridText.c
index 70754e09..04215460 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -41,10 +41,6 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
-#ifdef SH_EX	/* for DEBUG (1997/10/10 (Fri) 07:58:47) */
-#define NOTUSED_BAD_FOR_SCREEN
-#endif
-
 /*#define DEBUG_APPCH 1*/
 
 #ifdef SOURCE_CACHE
@@ -467,6 +463,14 @@ struct _HText {
 #endif
 };
 
+/* exported */
+PUBLIC void* HText_pool_calloc ARGS2(
+	HText *,	text,
+	unsigned,	size)
+{
+    return (void*) ALLOC_IN_POOL(&text->pool, size);
+}
+
 PRIVATE void HText_AddHiddenLink PARAMS((HText *text, TextAnchor *textanchor));
 
 #ifdef EXP_JUSTIFY_ELTS
@@ -744,6 +748,30 @@ PRIVATE void LYAddHiText ARGS3(
 }
 
 /*
+ * Return an offset to skip leading blanks in the highlighted link.  That is
+ * needed to avoid having the color-style paint the leading blanks.
+ */
+#ifdef USE_COLOR_STYLE
+PRIVATE int LYAdjHiTextPos ARGS2(
+	TextAnchor *,	a,
+	int,		count)
+{
+    char *result;
+
+    if (count >= a->lites.hl_len)
+	result = NULL;
+    else if (count > 0)
+	result = a->lites.hl_info[count - 1].hl_text;
+    else
+	result = a->lites.hl_base.hl_text;
+
+    return (result != 0) ? (LYSkipBlanks(result) - result) : 0;
+}
+#else
+#define LYAdjHiTextPos(a,count) 0
+#endif
+
+/*
  * Get the highlight text, counting from zero.
  */
 PRIVATE char *LYGetHiTextStr ARGS2(
@@ -758,6 +786,8 @@ PRIVATE char *LYGetHiTextStr ARGS2(
 	result = a->lites.hl_info[count - 1].hl_text;
     else
 	result = a->lites.hl_base.hl_text;
+    result += LYAdjHiTextPos(a, count);
+    CTRACE((tfp, "FIXME text '%s'\n", result));
     return result;
 }
 
@@ -776,6 +806,8 @@ PRIVATE int LYGetHiTextPos ARGS2(
 	result = a->lites.hl_info[count - 1].hl_x;
     else
 	result = a->line_pos;
+    result += LYAdjHiTextPos(a, count);
+    CTRACE((tfp, "FIXME cols '%d'\n", result));
     return result;
 }
 
@@ -890,6 +922,8 @@ PUBLIC HText *	HText_new ARGS1(
     if (anchor->document) {
 	HTList_removeObject(loaded_texts, anchor->document);
 	CTRACE((tfp, "GridText: Auto-uncaching\n")) ;
+
+	HTAnchor_delete_links(anchor);
 	((HText *)anchor->document)->node_anchor = NULL;
 	HText_free((HText *)anchor->document);
 	anchor->document = NULL;
@@ -1092,8 +1126,6 @@ PUBLIC void HText_free ARGS1(
     if (!self)
 	return;
 
-    HTAnchor_setDocument(self->node_anchor, (HyperDoc *)0);
-
     while (self->first_anchor) {		/* Free off anchor array */
 	TextAnchor * l = self->first_anchor;
 	self->first_anchor = l->next;
@@ -1194,7 +1226,12 @@ PUBLIC void HText_free ARGS1(
 	 */
 	HTAnchor_clearSourceCache(self->node_anchor);
 #endif
-	if (HTAnchor_delete(self->node_anchor))
+
+	HTAnchor_delete_links(self->node_anchor);
+
+	HTAnchor_setDocument(self->node_anchor, (HyperDoc *)0);
+
+	if (HTAnchor_delete(self->node_anchor->parent))
 	    /*
 	     *  Make sure HTMainAnchor won't point
 	     *  to an invalid structure. - KW
@@ -1681,6 +1718,16 @@ PRIVATE void display_title ARGS1(
     LYaddch('\n');
     FREE(title);
 
+#if defined(USE_COLOR_STYLE) && defined(CAN_CUT_AND_PASTE)
+    if (s_hot_paste != NOSTYLE) {	/* Only if the user set the style */
+	LYmove(0, LYcols - 1);
+	LynxChangeStyle(s_hot_paste, STACK_ON);
+	LYaddch(ACS_RARROW);
+	LynxChangeStyle(s_hot_paste, STACK_OFF);
+	LYmove(1, 0);			/* As after \n */
+    }
+#endif /* USE_COLOR_STYLE */
+
 #ifdef USE_COLOR_STYLE
 /* turn the TITLE style off */
     LynxChangeStyle(s_title, STACK_OFF);
@@ -3368,6 +3415,8 @@ PRIVATE void blank_lines ARGS2(
 	    newlines--;		/* Don't bother: already blank */
 	    line = line->prev;
 	}
+    } else if (AT_START_OF_CELL(text)) {
+	newlines = 1;			/* New line to get a correct offset */
     } else {
 	newlines++;			/* Need also to finish this line */
     }
@@ -5877,6 +5926,8 @@ re_parse:
 	line_ptr2 = line_ptr;
 	count_line = cur_line;
 	while (actual_len > hilite_len) {
+	    HTLine *old_line_ptr2 = line_ptr2;
+
 	    count_line++;
 	    line_ptr2 = line_ptr2->next;
 
@@ -5884,7 +5935,7 @@ re_parse:
 	     && count_line >= stop_before) {
 		LYClearHiText(anchor_ptr);
 		break;
-	    } else if (line_ptr2 == text->last_line) {
+	    } else if (old_line_ptr2 == text->last_line) {
 		break;
 	    }
 
@@ -9367,10 +9418,8 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 	if (HTCJK != NOCJK) {
 	    if (cp &&
 		(tmp = typecallocn(unsigned char, strlen(cp)+1)) != 0) {
-#ifdef SH_EX
 		if (tmp == NULL)
 		    outofmem(__FILE__, "HText_setLastOptionValue");
-#endif
 		if (kanji_code == EUC) {
 		    TO_EUC((unsigned char *)cp, tmp);
 		    val_cs = current_char_set;
@@ -11147,10 +11196,12 @@ PUBLIC int HText_SubmitForm ARGS4(
 		     * Names are different so this is the first textarea or a
 		     * different one from any before it.
 		     */
-		    if (Boundary) {
+		    if (PlainText) {
+			FREE(previous_blanks);
+		    } else if (Boundary) {
 			StrAllocCopy(previous_blanks, "\r\n");
 		    } else {
-			FREE(previous_blanks);
+			StrAllocCopy(previous_blanks, "%0d%0a");
 		    }
 		    escaped1 = escape_or_quote_name(name_used,
 						    my_data[anchor_count].quote,
@@ -11178,7 +11229,10 @@ PUBLIC int HText_SubmitForm ARGS4(
 			    FREE(previous_blanks);
 			}
 			BStrCat0(my_query, escaped2);
-			BStrCat0(my_query, marker);
+			if (PlainText || Boundary)
+			    BStrCat0(my_query, marker);
+			else
+			    StrAllocCopy(previous_blanks, marker);
 		    } else {
 			StrAllocCat(previous_blanks, marker);
 		    }
@@ -11463,8 +11517,6 @@ PRIVATE void free_all_texts NOARGS
      */
     while (loaded_texts && !HTList_isEmpty(loaded_texts)) {
 	if ((cur = (HText *)HTList_removeLastObject(loaded_texts)) != NULL) {
-	    if (cur->node_anchor && cur->node_anchor->underway)
-		cur->node_anchor->underway = FALSE;
 	    HText_free(cur);
 	}
     }
@@ -13886,7 +13938,7 @@ PUBLIC void redraw_lines_of_link ARGS1(
 	todr1 = todr1->prev;
 
     row = links[cur].ly;
-    for (count = 0; row < display_lines && (text = LYGetHiliteStr(cur, count)) != NULL; ++count) {
+    for (count = 0; row <= display_lines && (text = LYGetHiliteStr(cur, count)) != NULL; ++count) {
 	col = LYGetHilitePos(cur, count);
 	LYmove(row++, col);
 	redraw_part_of_line (todr1, text, strlen(text), HTMainText);
diff --git a/src/GridText.h b/src/GridText.h
index bfb61e79..b4130128 100644
--- a/src/GridText.h
+++ b/src/GridText.h
@@ -145,33 +145,34 @@ extern BOOLEAN HTcan_reparse_document NOPARAMS;
 extern BOOLEAN HTdocument_settings_changed NOPARAMS;
 #endif
 
-extern int HText_getTopOfScreen NOPARAMS;
-extern int HText_getLines PARAMS((HText * text));
-extern int HText_getNumOfLines NOPARAMS;
-extern int do_www_search PARAMS((DocInfo *doc));
-extern char * HTLoadedDocumentURL NOPARAMS;
-extern bstring * HTLoadedDocumentPost_data NOPARAMS;
-extern char * HTLoadedDocumentTitle NOPARAMS;
+extern BOOL HTLoadedDocumentEightbit NOPARAMS;
+extern BOOL HText_LastLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
+extern BOOL HText_PreviousLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
+extern BOOL HText_inLineOne PARAMS((HText *text));
 extern BOOLEAN HTLoadedDocumentIsHEAD NOPARAMS;
 extern BOOLEAN HTLoadedDocumentIsSafe NOPARAMS;
-extern char * HTLoadedDocumentCharset NOPARAMS;
-extern BOOL HTLoadedDocumentEightbit NOPARAMS;
-extern void HText_setNodeAnchorBookmark PARAMS((CONST char *bookmark));
+extern bstring * HTLoadedDocumentPost_data NOPARAMS;
 extern char * HTLoadedDocumentBookmark NOPARAMS;
-extern int HText_LastLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
+extern char * HTLoadedDocumentCharset NOPARAMS;
+extern char * HTLoadedDocumentTitle NOPARAMS;
+extern char * HTLoadedDocumentURL NOPARAMS;
+extern char * HText_HiddenLinkAt PARAMS((HText *text, int number));
+extern int HText_HiddenLinkCount PARAMS((HText *text));
 extern int HText_LastLineOffset PARAMS((HText *me));
+extern int HText_LastLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
 extern int HText_PreviousLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
-extern BOOL HText_LastLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
-extern BOOL HText_PreviousLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
-extern void HText_NegateLineOne PARAMS((HText *text));
-extern BOOL HText_inLineOne PARAMS((HText *text));
-extern void HText_RemovePreviousLine PARAMS((HText *text));
 extern int HText_getCurrentColumn PARAMS((HText *text));
+extern int HText_getLines PARAMS((HText * text));
 extern int HText_getMaximumColumn PARAMS((HText *text));
-extern void HText_setTabID PARAMS((HText *text, CONST char *name));
+extern int HText_getNumOfLines NOPARAMS;
 extern int HText_getTabIDColumn PARAMS((HText *text, CONST char *name));
-extern int HText_HiddenLinkCount PARAMS((HText *text));
-extern char * HText_HiddenLinkAt PARAMS((HText *text, int number));
+extern int HText_getTopOfScreen NOPARAMS;
+extern int do_www_search PARAMS((DocInfo *doc));
+extern void HText_NegateLineOne PARAMS((HText *text));
+extern void HText_RemovePreviousLine PARAMS((HText *text));
+extern void HText_setNodeAnchorBookmark PARAMS((CONST char *bookmark));
+extern void HText_setTabID PARAMS((HText *text, CONST char *name));
+extern void* HText_pool_calloc PARAMS((HText * text, unsigned size));
 
 /* "simple table" stuff */
 extern int HText_endStblTABLE PARAMS((HText *));
diff --git a/src/HTAlert.c b/src/HTAlert.c
index a8049e04..74276513 100644
--- a/src/HTAlert.c
+++ b/src/HTAlert.c
@@ -137,12 +137,7 @@ PUBLIC void HTProgress ARGS1(
     statusline(Msg);
     LYstore_message(Msg);
     CTRACE((tfp, "%s\n", Msg));
-#if defined(SH_EX) && defined(WIN_EX)	/* 1997/10/11 (Sat) 12:51:02 */
-    {
-	if (debug_delay != 0)
-	    Sleep(debug_delay);	/* XXX msec */
-    }
-#endif
+    LYSleepDebug();
 }
 
 PRIVATE char *sprint_bytes ARGS3(
@@ -327,6 +322,38 @@ PUBLIC BOOL HTLastConfirmCancelled NOARGS
     }
 }
 
+/*
+ * Prompt for yes/no response, but let a configuration variable override
+ * the prompt entirely.
+ */
+PUBLIC int HTForcedPrompt ARGS3(
+	int,		option,
+	CONST char *,	msg,
+	int,		dft)
+{
+    int result = FALSE;
+    char *show = NULL;
+    char *msg2 = NULL;
+
+    if (option == FORCE_PROMPT_DFT) {
+	result = HTConfirmDefault(msg, dft);
+    } else {
+	if (option == FORCE_PROMPT_YES) {
+	    show = gettext("yes");
+	    result = YES;
+	} else if (option == FORCE_PROMPT_NO) {
+	    show = gettext("no");
+	    result = NO;
+	} else {
+	    return HTConfirmDefault(msg, dft);	/* bug... */
+	}
+	HTSprintf(&msg2, "%s %s", msg, show);
+	HTUserMsg(msg2);
+	free(msg2);
+    }
+    return result;
+}
+
 #define DFT_CONFIRM ~(YES|NO)
 
 /*	Seek confirmation with default answer.		HTConfirmDefault()
@@ -1049,6 +1076,12 @@ PUBLIC void LYSleepAlert NOARGS
 	LYSleep(AlertSecs);
 }
 
+PUBLIC void LYSleepDebug NOARGS
+{
+    if (okToSleep())
+	LYSleep(DebugSecs);
+}
+
 PUBLIC void LYSleepInfo NOARGS
 {
     if (okToSleep())
diff --git a/src/HTAlert.h b/src/HTAlert.h
index 2bc828c8..43ffd49a 100644
--- a/src/HTAlert.h
+++ b/src/HTAlert.h
@@ -50,6 +50,11 @@ extern void HTReadProgress PARAMS((long bytes, long total));
  */
 extern BOOL HTLastConfirmCancelled NOPARAMS;
 
+/*
+**	Supports logic for forced yes/no prompt results.
+*/
+extern int HTForcedPrompt PARAMS((int Opt, CONST char * Msg, int Dft));
+
 /*      Display a message, then wait for 'yes' or 'no', allowing default
 **	response if a return or left-arrow is used.
 **
@@ -150,6 +155,7 @@ extern int HTConfirmPostRedirect PARAMS((
 
 
 extern void LYSleepAlert NOPARAMS;
+extern void LYSleepDebug NOPARAMS;
 extern void LYSleepInfo NOPARAMS;
 extern void LYSleepMsg NOPARAMS;
 extern void LYSleepReplay NOPARAMS;
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index 551683dc..170fedbc 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -37,7 +37,7 @@ extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
 #include <LYLeaks.h>
 #include <LYKeymap.h>
 
-#ifdef EXP_PERSISTENT_COOKIES 
+#ifdef EXP_PERSISTENT_COOKIES
 #include <LYCookie.h>
 #endif
 
@@ -48,7 +48,7 @@ PUBLIC BOOLEAN LYCancelDownload=FALSE;   /* exported to HTFormat.c in libWWW */
 
 #ifdef VMS
 PRIVATE char * FIXED_RECORD_COMMAND = NULL;
-#ifdef USE_COMMAND_FILE 	     /* Keep this as an option. - FM	*/
+#ifdef USE_COMMAND_FILE		     /* Keep this as an option. - FM	*/
 #define FIXED_RECORD_COMMAND_MASK "@Lynx_Dir:FIXED512 %s"
 #else
 #define FIXED_RECORD_COMMAND_MASK "%s"
@@ -412,7 +412,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 		    status = SetForegroundWindow(cur_handle);
 		}
 #else
-	        start_curses();
+		start_curses();
 #endif
 	    }
 	}
@@ -424,14 +424,14 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 	if (me->anchor->FileCache)
 	    remove(me->anchor->FileCache);
 	FREE(me);
-#ifdef EXP_PERSISTENT_COOKIES 
-	/* 
-	 *  We want to save cookies picked up when in source 
-	 *  mode.  ... 
-	 */ 
-	if (persistent_cookies) 
-	    LYStoreCookies(LYCookieSaveFile); 
-#endif /* EXP_PERSISTENT_COOKIES */ 
+#ifdef EXP_PERSISTENT_COOKIES
+	/*
+	 *  We want to save cookies picked up when in source
+	 *  mode.  ...
+	 */
+	if (persistent_cookies)
+	    LYStoreCookies(LYCookieSaveFile);
+#endif /* EXP_PERSISTENT_COOKIES */
 	exit_immediately(EXIT_SUCCESS);
     }
 
@@ -439,6 +439,12 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
     return;
 }
 
+#ifdef VMS
+#  define REMOVE_COMMAND "delete/noconfirm/nolog %s;"
+#else
+#  define REMOVE_COMMAND "%s"
+#endif /* VMS */
+
 /*	Abort writing
 **	-------------
 */
@@ -453,7 +459,19 @@ PRIVATE void HTFWriter_abort ARGS2(
 	CTRACE((tfp, "HTFWriter: Aborting: file not executed or saved.\n"));
 	FREE(me->end_command);
 	if (me->remove_command) {
+#ifdef VMS
 	    LYSystem(me->remove_command);
+#else
+	    chmod(me->remove_command, 0600);		/* Ignore errors */
+	    if (0 != unlink(me->remove_command)) {
+		char buf[560];
+
+		sprintf(buf, "%.60s '%.400s': %.60s",
+			gettext("Error deleting file"),
+			me->remove_command, strerror(errno));
+		HTAlert(buf);
+	    }
+#endif
 	    FREE(me->remove_command);
 	}
     }
@@ -587,12 +605,6 @@ PRIVATE char *mailcap_substitute ARGS3(
     return result;
 }
 
-#ifndef VMS
-#define REMOVE_COMMAND "/bin/rm -f %s"
-#else
-#define REMOVE_COMMAND "delete/noconfirm/nolog %s;"
-#endif /* VMS */
-
 /*	Take action using a system command
 **	----------------------------------
 **
@@ -662,10 +674,10 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
 	 *  so that the open fp gets registered in the list keeping track of
 	 *  temp files, equivalent to when LYOpenTemp() gets called below.
 	 *  This avoids a file descriptor leak caused by LYCloseTempFP()
-	 *  not being able to find the fp.  The ".bin" suffix is expected
+	 *  not being able to find the fp.  The binary suffix is expected
 	 *  to not be used, it's only for fallback in unusual error cases. - kw
 	 */
-	me->fp = LYOpenTempRewrite(fnam, ".bin", BIN_W);
+	me->fp = LYOpenTempRewrite(fnam, BIN_SUFFIX, BIN_W);
     } else {
 #if defined(WIN_EX) && !defined(__CYGWIN__)	/* 1998/01/04 (Sun) */
 	if (!strncmp(anchor->address,"file://localhost",16)) {
@@ -717,15 +729,13 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
 	 */
 	if (!strcasecomp(pres->rep->name, "text/html")) {
 	    suffix = HTML_SUFFIX;
-	} else if (!strcasecomp(pres->rep->name, "text/plain")) {
-	    suffix = ".txt";
-	} else if (!strcasecomp(pres->rep->name,
-				"application/octet-stream")) {
-	    suffix = ".bin";
-	} else if (
-	(suffix = HTFileSuffix(pres->rep, anchor->content_encoding)) == 0
-		   || *suffix != '.')
-	{
+	} else if (!strncasecomp(pres->rep->name, "text/", 5)) {
+	    suffix = TEXT_SUFFIX;
+	} else if (!strncasecomp(pres->rep->name, "application/", 12)) {
+	    suffix = BIN_SUFFIX;
+	} else if ((suffix = HTFileSuffix(pres->rep,
+					  anchor->content_encoding)) == 0
+		    || *suffix != '.') {
 	    suffix = HTML_SUFFIX;
 	}
 	me->fp = LYOpenTemp(fnam, suffix, BIN_W);
@@ -857,10 +867,10 @@ PUBLIC HTStream* HTSaveToFile ARGS3(
 	 *  so that the open fp gets registered in the list keeping track of
 	 *  temp files, equivalent to when LYOpenTemp() gets called below.
 	 *  This avoids a file descriptor leak caused by LYCloseTempFP()
-	 *  not being able to find the fp.  The ".bin" suffix is expected
+	 *  not being able to find the fp.  The binary suffix is expected
 	 *  to not be used, it's only for fallback in unusual error cases. - kw
 	 */
-	ret_obj->fp = LYOpenTempRewrite(fnam, ".bin", BIN_W);
+	ret_obj->fp = LYOpenTempRewrite(fnam, BIN_SUFFIX, BIN_W);
     } else {
 	/*
 	 *  Check for a suffix.
@@ -868,11 +878,10 @@ PUBLIC HTStream* HTSaveToFile ARGS3(
 	 */
 	if (!strcasecomp(pres->rep->name, "text/html")) {
 	    suffix = HTML_SUFFIX;
-	} else if (!strcasecomp(pres->rep->name, "text/plain")) {
-	    suffix = ".txt";
-	} else if (!strcasecomp(pres->rep->name,
-				    "application/octet-stream")) {
-	    suffix = ".bin";
+	} else if (!strncasecomp(pres->rep->name, "text/", 5)) {
+	    suffix = TEXT_SUFFIX;
+	} else if (!strncasecomp(pres->rep->name, "application/", 12)) {
+	    suffix = BIN_SUFFIX;
 	} else if ((suffix = HTFileSuffix(pres->rep,
 					  anchor->content_encoding)) == 0
 		    || *suffix != '.') {
@@ -1080,10 +1089,10 @@ PUBLIC HTStream* HTCompressed ARGS3(
 	    break;
 	}
     }
-    if (can_present == FALSE || 		 /* no presentation mapping */
+    if (can_present == FALSE ||			 /* no presentation mapping */
 	uncompress_mask == NULL ||		    /* not gzip or compress */
 	strchr(anchor->content_type, ';') ||		   /* wrong charset */
-	HTOutputFormat == HTAtom_for("www/download") || 	/* download */
+	HTOutputFormat == HTAtom_for("www/download") ||		/* download */
 	!strcasecomp(pres->rep_out->name, "www/download") ||	/* download */
 	(traversal &&	   /* only handle html or plain text for traversals */
 	 strcasecomp(anchor->content_type, "text/html") &&
@@ -1144,11 +1153,10 @@ PUBLIC HTStream* HTCompressed ARGS3(
     if (!strcasecomp(anchor->content_type, "text/html")) {
 	middle = HTML_SUFFIX;
 	middle++;		/* point to 'h' of .htm(l) - kw */
-    } else if (!strcasecomp(anchor->content_type, "text/plain")) {
-	middle = "txt";
-    } else if (!strcasecomp(anchor->content_type,
-			    "application/octet-stream")) {
-	middle = "bin";
+    } else if (!strncasecomp(anchor->content_type, "text/", 5)) {
+	middle = TEXT_SUFFIX + 1;
+    } else if (!strncasecomp(anchor->content_type, "application/", 12)) {
+	middle = BIN_SUFFIX + 1;
     } else if ((suffix =
 		HTFileSuffix(HTAtom_for(anchor->content_type), NULL)) &&
 	       *suffix == '.') {
@@ -1350,7 +1358,7 @@ PUBLIC unsigned long LYVMS_FixedLengthRecords ARGS1(char *, filename)
     attr_rqst_list[2].atr$l_addr = 0;
     /* file "record" attributes */
     memset((void *)&recattr, 0, sizeof recattr);
-    fchars = 0; 	/* file characteristics */
+    fchars = 0;		/* file characteristics */
 
     /* get current attributes */
     sts = sys$qiow(0, channel, IO$_ACCESS, iosb, (void(*)())0, 0,
diff --git a/src/HTForms.h b/src/HTForms.h
index 0541a519..cf31e49e 100644
--- a/src/HTForms.h
+++ b/src/HTForms.h
@@ -132,8 +132,11 @@ typedef struct _PerFormInfo
 #define F_IMAGE_SUBMIT_TYPE 13
 #define F_KEYGEN_TYPE     14
 
-#define F_TEXTLIKE(type) ((type)==F_TEXT_TYPE || (type)==F_TEXT_SUBMIT_TYPE ||\
-			  (type)==F_PASSWORD_TYPE || (type)==F_TEXTAREA_TYPE)
+#define F_TEXTLIKE(type) ((type)==F_TEXT_TYPE ||\
+			  (type)==F_TEXT_SUBMIT_TYPE ||\
+			  (type)==F_PASSWORD_TYPE ||\
+			  (type)==F_FILE_TYPE ||\
+			  (type)==F_TEXTAREA_TYPE)
 
 #define WWW_FORM_LINK_TYPE  1
 #define WWW_LINK_TYPE   2
diff --git a/src/HTML.c b/src/HTML.c
index a77bb5b5..8ea5d2bf 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -3551,7 +3551,7 @@ PRIVATE int HTML_start_element ARGS6(
 	     *	set. - FM && KW
 	     */
 	    StrAllocCopy(me->map_address, me->node_anchor->address);
-	    if ((cp = strrchr(me->map_address, '#')) != NULL)
+	    if ((cp = strchr(me->map_address, '#')) != NULL)
 		*cp = '\0';
 	    StrAllocCat(me->map_address, "#");
 	    StrAllocCat(me->map_address, id_string);
@@ -5397,7 +5397,6 @@ PRIVATE int HTML_start_element ARGS6(
 	if (present && present[HTML_TABLE_ALIGN] &&
 	    value[HTML_TABLE_ALIGN] && *value[HTML_TABLE_ALIGN]) {
 	    if (!strcasecomp(value[HTML_TABLE_ALIGN], "center")) {
-#ifdef SH_EX	/* 1998/10/09 (Fri) 15:20:09 */
 		if (no_table_center) {
 		    me->DivisionAlignments[me->Division_Level] = HT_LEFT;
 		    change_paragraph_style(me, styles[HTML_DLEFT]);
@@ -5411,12 +5410,7 @@ PRIVATE int HTML_start_element ARGS6(
 		    me->current_default_alignment =
 					styles[HTML_DCENTER]->alignment;
 		}
-#else
-		me->DivisionAlignments[me->Division_Level] = HT_CENTER;
-		change_paragraph_style(me, styles[HTML_DCENTER]);
-		UPDATE_STYLE;
-		me->current_default_alignment = styles[HTML_DCENTER]->alignment;
-#endif
+
 		stbl_align = HT_CENTER;
 
 	    } else if (!strcasecomp(value[HTML_TABLE_ALIGN], "right")) {
@@ -5486,14 +5480,10 @@ PRIVATE int HTML_start_element ARGS6(
 	if (present && present[HTML_TR_ALIGN] && value[HTML_TR_ALIGN]) {
 	    if (!strcasecomp(value[HTML_TR_ALIGN], "center") &&
 		!(me->List_Nesting_Level >= 0 && !me->inP)) {
-#ifdef SH_EX
 		if (no_table_center)
 		    me->sp->style->alignment = HT_LEFT;
 		else
 		    me->sp->style->alignment = HT_CENTER;
-#else
-		me->sp->style->alignment = HT_CENTER;
-#endif
 		stbl_align = HT_CENTER;
 	    } else if (!strcasecomp(value[HTML_TR_ALIGN], "right") &&
 		       !(me->List_Nesting_Level >= 0 && !me->inP)) {
@@ -8098,9 +8088,10 @@ PRIVATE HTStream* CacheThru_new ARGS2(
 	return target;
 
 #ifndef DEBUG_SOURCE_CACHE
-    /*  Only remote HTML documents may benefits from HTreparse_document(), */
+    /*  Only remote HTML documents may benefit from HTreparse_document(),  */
     /*  oh, assume http protocol:                                          */
-    if (strcmp(p->name, "http") != 0) {
+    if (strcmp(p->name, "http") != 0
+     && strcmp(p->name, "https") != 0) {
 	CTRACE((tfp, "SourceCacheWriter: Protocol is \"%s\"; not caching\n", p->name));
 	return target;
     }
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
index baa40d80..256842f5 100644
--- a/src/LYBookmark.c
+++ b/src/LYBookmark.c
@@ -425,10 +425,8 @@ Note: if you edit this file manually\n\
 		WWWDoc.bookmark = HDOC(i).bookmark;
 		WWWDoc.isHEAD = FALSE;
 		WWWDoc.safe = FALSE;
-		if (((tmpanchor = HTAnchor_parent(
-					HTAnchor_findAddress(&WWWDoc)
-						 )) != NULL) &&
-		    (text = (HText *)HTAnchor_document(tmpanchor)) != NULL) {
+		tmpanchor = HTAnchor_findAddress(&WWWDoc);
+		if ((text = (HText *)HTAnchor_document(tmpanchor)) != NULL) {
 		    HText_setNoCache(text);
 		}
 		break;
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index 42bee126..a0a68ecf 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -2538,7 +2538,7 @@ PUBLIC void LYHandleMETA ARGS4(
 	    /* id_string seems to be used wrong below if given.
 	       not that it matters much.  avoid setting it here. - kw */
 	    if ((strncmp(href, "http", 4) == 0) &&
-		(cp = strrchr(href, '#')) != NULL) {
+		(cp = strchr(href, '#')) != NULL) {
 		StrAllocCopy(id_string, cp);
 		*cp = '\0';
 	    }
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 6de3cf55..6e558247 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -489,7 +489,7 @@ PRIVATE void store_cookie ARGS3(
 		       INVALID_COOKIE_DOMAIN_CONFIRMATION,
 		       co->domain,
 		       hostname);
-	    if (!HTConfirmDefault(msg, NO)) {
+	    if (!HTForcedPrompt(cookie_noprompt, msg, NO)) {
 		CTRACE((tfp, "store_cookie: Rejecting domain '%s' for host '%s'.\n",
 			co->domain,
 			hostname));
@@ -502,7 +502,7 @@ PRIVATE void store_cookie ARGS3(
 	    HTSprintf0(&msg,
 		       INVALID_COOKIE_PATH_CONFIRMATION,
 		       co->path, path);
-	    if (!HTConfirmDefault(msg, NO)) {
+	    if (!HTForcedPrompt(cookie_noprompt, msg, NO)) {
 		CTRACE((tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
 		       co->path, path));
 		freeCookie(co);
diff --git a/src/LYCurses.h b/src/LYCurses.h
index 30a5a064..9c533f39 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -315,8 +315,12 @@ extern WINDOW *LYstartPopup PARAMS((int top_y, int left_x, int height, int width
 
 #ifdef HAVE_NAPMS
 #define SECS2Secs(n) (1000 * (n))
+#define Secs2SECS(n) ((n) / 1000.0)
+#define SECS_FMT "%.3f"
 #else
 #define SECS2Secs(n) (n)
+#define Secs2SECS(n) (n)
+#define SECS_FMT "%.0f"
 #endif
 
 /* Both slang and curses: */
diff --git a/src/LYDownload.c b/src/LYDownload.c
index eb379746..869a7e4e 100644
--- a/src/LYDownload.c
+++ b/src/LYDownload.c
@@ -463,6 +463,19 @@ cancelled:
 }
 
 /*
+ * Compare a filename with a given suffix, which we have set to give a rough
+ * idea of its content.
+ */
+PRIVATE int SuffixIs ARGS2(
+	char *,		filename,
+	char *,		suffix)
+{
+    size_t have = strlen(filename);
+    size_t need = strlen(suffix);
+    return have > need && !strcmp(filename + have - need, suffix);
+}
+
+/*
  *  LYdownload_options writes out the current download choices to
  *  a file so that the user can select downloaders in the same way that
  *  they select all other links.  Download links look like:
@@ -521,13 +534,27 @@ PUBLIC int LYdownload_options ARGS2(
 	 */
 	if (!lynx_edit_mode)
 #endif /* DIRED_SUPPORT */
-	fprintf(fp0,
-		"   <a href=\"%s//Method=-1/File=%s/SugFile=%s%s\">%s</a>\n",
-		STR_LYNXDOWNLOAD,
-		data_file,
-		NonNull(lynx_save_space),
-		sug_filename,
-		gettext("Save to disk"));
+	{
+	    fprintf(fp0,
+		    "   <a href=\"%s//Method=-1/File=%s/SugFile=%s%s\">%s</a>\n",
+		    STR_LYNXDOWNLOAD,
+		    data_file,
+		    NonNull(lynx_save_space),
+		    sug_filename,
+		    gettext("Save to disk"));
+	    /*
+	     * If it is not a binary file, offer the opportunity to view the
+	     * downloaded temporary file (see HTSaveToFile).
+	     */
+	    if (SuffixIs(data_file, HTML_SUFFIX)
+	     || SuffixIs(data_file, TEXT_SUFFIX)) {
+		fprintf(fp0,
+			"   <a href=\"file://localhost%s%s\">%s</a>\n",
+			NonNull(lynx_save_space),
+			data_file,
+			gettext("View temporary file"));
+	    }
+	}
     } else {
 	fprintf(fp0, "   <em>%s</em>\n", gettext("Save to disk disabled."));
     }
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index 8204b4c4..008ee5c6 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -529,15 +529,12 @@ Try_Redirected_URL:
 	    if (no_mail) {
 		HTUserMsg(MAIL_DISABLED);
 	    } else {
-		HTParentAnchor *tmpanchor;
+		HTParentAnchor *tmpanchor = HTAnchor_findAddress(&WWWDoc);
 		CONST char *title;
 		char *tmptitle = NULL;
 
 		title = "";
-		if ((tmpanchor = HTAnchor_parent(
-					HTAnchor_findAddress(&WWWDoc)
-						)) != NULL &&
-		    HTAnchor_title(tmpanchor)) {
+		if (HTAnchor_title(tmpanchor)) {
 			title = HTAnchor_title(tmpanchor);
 		} else if (HTMainAnchor && !LYUserSpecifiedURL) {
 		    title = HTAnchor_subject(HTMainAnchor);
@@ -1005,19 +1002,15 @@ Try_Redirected_URL:
 		 *  file waiting for us to download.
 		 */
 		if (WWW_Download_File) {
-		    HTParentAnchor *tmpanchor;
+		    HTParentAnchor *tmpanchor = HTAnchor_findAddress(&WWWDoc);
 		    char *fname = NULL;
 
 		    /*
 		     *	Check for a suggested filename from
 		     *	the Content-Disposition header. - FM
 		     */
-		    if (((tmpanchor = HTAnchor_parent(
-					HTAnchor_findAddress(&WWWDoc)
-						     )) != NULL) &&
-			HTAnchor_SugFname(tmpanchor) != NULL) {
-			StrAllocCopy(fname,
-				     HTAnchor_SugFname(tmpanchor));
+		    if (HTAnchor_SugFname(tmpanchor) != NULL) {
+			StrAllocCopy(fname, HTAnchor_SugFname(tmpanchor));
 		    } else {
 			StrAllocCopy(fname, doc->address);
 		    }
@@ -1026,10 +1019,8 @@ Try_Redirected_URL:
 		     *	which we don't uncompress for downloads,
 		     *	and adjust any suffix appropriately. - FM
 		     */
-		    if (tmpanchor != NULL) {
-			HTCheckFnameForCompression(&fname, tmpanchor,
-						   FALSE);
-		    }
+		    HTCheckFnameForCompression(&fname, tmpanchor, FALSE);
+
 		    if (LYdownload_options(&fname,
 					   WWW_Download_File) < 0) {
 			FREE(fname);
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index 90c7a39c..6a2fcd5b 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -385,6 +385,7 @@ extern char * LYToolbarName;
 extern int AlertSecs;
 extern int InfoSecs;
 extern int MessageSecs;
+extern int DebugSecs;
 extern int ReplaySecs;
 
 extern char * LYUserAgent;		/* Lynx User-Agent header */
@@ -453,10 +454,14 @@ extern int LYHiddenLinks;
 extern int Old_DTD;
 
 #define MBM_V_MAXFILES  25		/* Max number of sub-bookmark files */
+
 /*
  *  Arrays that holds the names of sub-bookmark files
  *  and their descriptions.
  */
+extern char *MBM_A_subbookmark[MBM_V_MAXFILES+1];
+extern char *MBM_A_subdescript[MBM_V_MAXFILES+1];
+
 extern BOOLEAN LYForceSSLCookiesSecure;
 extern BOOLEAN LYNoCc;
 extern BOOLEAN LYNonRestartingSIGWINCH;
@@ -470,8 +475,18 @@ extern BOOLEAN LYSeekFragMAPinCur;
 extern BOOLEAN LYStripDotDotURLs;	/* Try to fix ../ in some URLs?  */
 extern BOOLEAN LYUseBuiltinSuffixes;
 extern BOOLEAN dont_wrap_pre;
-extern char *MBM_A_subbookmark[MBM_V_MAXFILES+1];
-extern char *MBM_A_subdescript[MBM_V_MAXFILES+1];
+
+extern int cookie_noprompt;
+
+typedef enum {
+    FORCE_PROMPT_DFT		/* force a prompt, use the result */
+    ,FORCE_PROMPT_YES		/* assume "yes" where a prompt would be used */
+    ,FORCE_PROMPT_NO		/* assume "no" where a prompt would be used */
+} FORCE_PROMPT;
+
+#ifdef USE_SSL
+extern int ssl_noprompt;
+#endif
 
 #ifdef MISC_EXP
 extern int LYNoZapKey;  /* 0: off (do 'z' checking), 1: full, 2: initially */
@@ -530,11 +545,9 @@ extern int lynx_timeout;
 
 #ifdef SH_EX
 extern BOOLEAN show_cfg;
-#ifdef WIN_EX
-extern int     debug_delay;
 #endif
+
 extern BOOLEAN no_table_center;
-#endif
 
 #if USE_BLAT_MAILER
 extern BOOLEAN mail_is_blat;
diff --git a/src/LYHash.h b/src/LYHash.h
index 80ecbece..d88208ce 100644
--- a/src/LYHash.h
+++ b/src/LYHash.h
@@ -42,6 +42,13 @@ extern int	s_alert;
 extern int	s_alink;
 extern int	s_curedit;
 extern int	s_forw_backw;
+extern int	s_hot_paste;
+extern int	s_menu_active;
+extern int	s_menu_bg;
+extern int	s_menu_entry;
+extern int	s_menu_frame;
+extern int	s_menu_number;
+extern int	s_menu_sb;
 extern int	s_normal;
 extern int	s_prompt_edit;
 extern int	s_prompt_edit_arr;
@@ -50,12 +57,6 @@ extern int	s_prompt_sel;
 extern int	s_status;
 extern int	s_title;
 extern int	s_whereis;
-extern int	s_menu_frame;
-extern int	s_menu_bg;
-extern int	s_menu_number;
-extern int	s_menu_entry;
-extern int	s_menu_active;
-extern int	s_menu_sb;
 
 #ifdef USE_SCROLLBAR
 extern int	s_sb_aa;
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 2fe446d4..64d3f76d 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -254,7 +254,6 @@ PUBLIC BOOLEAN LYwouldPush ARGS2(
 	rc = (BOOLEAN)
 		! (LYIsUIPage(docurl, UIP_HISTORY)
 		|| LYIsUIPage(docurl, UIP_PRINT_OPTIONS)
-		|| LYIsUIPage(docurl, UIP_DOWNLOAD_OPTIONS)
 #ifdef DIRED_SUPPORT
 		|| LYIsUIPage(docurl, UIP_DIRED_MENU)
 		|| LYIsUIPage(docurl, UIP_UPLOAD_OPTIONS)
@@ -265,7 +264,6 @@ PUBLIC BOOLEAN LYwouldPush ARGS2(
 	rc = (BOOLEAN)
 		! (!strcmp(title, HISTORY_PAGE_TITLE)
 		|| !strcmp(title, PRINT_OPTIONS_TITLE)
-		|| !strcmp(title, DOWNLOAD_OPTIONS_TITLE)
 #ifdef DIRED_SUPPORT
 		|| !strcmp(title, DIRED_MENU_TITLE)
 		|| !strcmp(title, UPLOAD_OPTIONS_TITLE)
@@ -449,7 +447,7 @@ PUBLIC int LYpush ARGS2(
 		WWWDoc.isHEAD = doc->isHEAD;
 		WWWDoc.safe = doc->safe;
 		thisparent =
-		    HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+		    HTAnchor_findAddress(&WWWDoc);
 		/* Now find the ParentAnchor for the previous history
 		** item - kw
 		*/
@@ -476,7 +474,7 @@ PUBLIC int LYpush ARGS2(
 			WWWDoc.isHEAD = HDOC(nhist-1).isHEAD;
 			WWWDoc.safe = HDOC(nhist-1).safe;
 			thatparent =
-			    HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+			    HTAnchor_findAddress(&WWWDoc);
 			FREE(temp);
 		    } else {
 			WWWDoc.address = HDOC(nhist-1).address;
@@ -488,7 +486,7 @@ PUBLIC int LYpush ARGS2(
 			WWWDoc.isHEAD = HDOC(nhist-1).isHEAD;
 			WWWDoc.safe = HDOC(nhist-1).safe;
 			thatparent =
-			    HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+			    HTAnchor_findAddress(&WWWDoc);
 		    }
 		    /* In addition to equality of the ParentAnchors, require
 		    ** that IF we have a HTMainText (i.e., it wasn't just
@@ -763,7 +761,7 @@ PUBLIC BOOLEAN historytarget ARGS1(
 	WWWDoc.bookmark = newdoc->bookmark;
 	WWWDoc.isHEAD = newdoc->isHEAD;
 	WWWDoc.safe = newdoc->safe;
-	tmpanchor = HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+	tmpanchor = HTAnchor_findAddress(&WWWDoc);
 	text = (HText *)HTAnchor_document(tmpanchor);
 	if (((((LYresubmit_posts == TRUE) ||
 	       (LYforce_no_cache == TRUE &&
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index a436bc67..b0f6dce1 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -77,15 +77,9 @@ LYK_REFRESH,      LYK_ACTIVATE,     LYK_DOWN_TWO,      0,
 /* ^L */            /* cr */        /* ^N */       /* ^O */
 #endif
 
-#ifdef SH_EX	/* 1998/10/02 (Fri) 08:48:44 */
 LYK_UP_TWO,       LYK_CHG_CENTER,   LYK_RELOAD,    LYK_TO_CLIPBOARD,
 /* ^P */            /* XON */       /* ^R */       /* ^S */
 
-#else
-LYK_UP_TWO,             0,          LYK_RELOAD,        0,
-/* ^P */            /* XON */       /* ^R */       /* XOFF */
-#endif
-
 LYK_TRACE_TOGGLE,       0,        LYK_SWITCH_DTD,  LYK_REFRESH,
 /* ^T */            /* ^U */        /* ^V */       /* ^W */
 
@@ -935,11 +929,9 @@ PRIVATE Kcmd revmap[] = {
 	LYK_INSTALL, "INSTALL",
 	"install file or tagged files into a system area" ),
 #endif /* DIRED_SUPPORT */
-#ifdef SH_EX /* 1999/01/01 (Fri) 01:18:12 */
     DATA(
 	LYK_CHG_CENTER, "CHANGE_CENTER",
 	"toggle center alignment in HTML TABLE" ),
-#endif
 #ifdef KANJI_CODE_OVERRIDE
     DATA(
 	LYK_CHG_KCODE, "CHANGE_KCODE",
@@ -991,7 +983,7 @@ PRIVATE CONST struct {
     { ' ',		"<space>" },
     { '<',		"<" },
     { '>',		">" },
-    { 0177,		"<delete>" },
+    { CH_DEL,		"<delete>" },
     { UPARROW,		"Up Arrow" },
     { DNARROW,		"Down Arrow" },
     { RTARROW,		"Right Arrow" },
@@ -1509,125 +1501,129 @@ PUBLIC int remap ARGS3(
     return 0;
 }
 
+typedef struct {
+    int	code;
+    LYKeymap_t map;
+    LYKeymap_t save;
+} ANY_KEYS;
+
+/*
+ * Save the given keys in the table, setting them to the map'd value.
+ */
+PRIVATE void set_any_keys ARGS2(
+	ANY_KEYS *,	table,
+	int,		size)
+{
+    int j, k;
+
+    for (j = 0; j < size; ++j) {
+	k = table[j].code + 1;
+	table[j].save = keymap[k];
+	keymap[k] = table[j].map;
+    }
+}
+
+/*
+ * Restore the given keys from the table.
+ */
+PRIVATE void reset_any_keys ARGS2(
+	ANY_KEYS *,	table,
+	int,		size)
+{
+    int j, k;
+
+    for (j = 0; j < size; ++j) {
+	k = table[j].code + 1;
+	keymap[k] = table[j].save;
+    }
+}
+
+static ANY_KEYS vms_keys_table[] = {
+    { 26,   LYK_ABORT,   0 },	/* control-Z */
+    { '$',  LYK_SHELL,   0 },
+};
 
 PUBLIC void set_vms_keys NOARGS
 {
-      keymap[26+1] = LYK_ABORT;  /* control-Z */
-      keymap['$'+1] = LYK_SHELL;
+    set_any_keys(vms_keys_table, TABLESIZE(vms_keys_table));
 }
 
-static LYKeymap_t saved_vi_keys[4];
+static ANY_KEYS vi_keys_table[] = {
+    { 'h', LYK_PREV_DOC,  0 },
+    { 'j', LYK_NEXT_LINK, 0 },
+    { 'k', LYK_PREV_LINK, 0 },
+    { 'l', LYK_ACTIVATE,  0 },
+};
+
 static BOOLEAN did_vi_keys;
 
 PUBLIC void set_vi_keys NOARGS
 {
-      saved_vi_keys[0] = keymap['h'+1];
-      keymap['h'+1] = LYK_PREV_DOC;
-      saved_vi_keys[1] = keymap['j'+1];
-      keymap['j'+1] = LYK_NEXT_LINK;
-      saved_vi_keys[2] = keymap['k'+1];
-      keymap['k'+1] = LYK_PREV_LINK;
-      saved_vi_keys[3] = keymap['l'+1];
-      keymap['l'+1] = LYK_ACTIVATE;
-
-      did_vi_keys = TRUE;
+    set_any_keys(vi_keys_table, TABLESIZE(vi_keys_table));
+    did_vi_keys = TRUE;
 }
 
 PUBLIC void reset_vi_keys NOARGS
 {
-      if (!did_vi_keys)
-              return;
-
-      keymap['h'+1] = saved_vi_keys[0];
-      keymap['j'+1] = saved_vi_keys[1];
-      keymap['k'+1] = saved_vi_keys[2];
-      keymap['l'+1] = saved_vi_keys[3];
-
-      did_vi_keys = FALSE;
+    if (did_vi_keys) {
+	reset_any_keys(vi_keys_table, TABLESIZE(vi_keys_table));
+	did_vi_keys = FALSE;
+    }
 }
 
-static LYKeymap_t saved_emacs_keys[4];
+static ANY_KEYS emacs_keys_table[] = {
+    { 2,  LYK_PREV_DOC,  0 },	/* ^B */
+    { 14, LYK_NEXT_LINK, 0 },	/* ^N */
+    { 16, LYK_PREV_LINK, 0 },	/* ^P */
+    { 6,  LYK_ACTIVATE,  0 },	/* ^F */
+};
+
 static BOOLEAN did_emacs_keys;
 
 PUBLIC void set_emacs_keys NOARGS
 {
-      saved_emacs_keys[0] = keymap[2+1];
-      keymap[2+1] = LYK_PREV_DOC;       /* ^B */
-      saved_emacs_keys[1] = keymap[14+1];
-      keymap[14+1] = LYK_NEXT_LINK;     /* ^N */
-      saved_emacs_keys[2] = keymap[16+1];
-      keymap[16+1] = LYK_PREV_LINK;     /* ^P */
-      saved_emacs_keys[3] = keymap[6+1];
-      keymap[6+1] = LYK_ACTIVATE;         /* ^F */
-
-      did_emacs_keys = TRUE;
+    set_any_keys(emacs_keys_table, TABLESIZE(emacs_keys_table));
+    did_emacs_keys = TRUE;
 }
 
 PUBLIC void reset_emacs_keys NOARGS
 {
-      if (!did_emacs_keys)
-              return;
-
-      keymap[2+1] = saved_emacs_keys[0];
-      keymap[14+1] = saved_emacs_keys[1];
-      keymap[16+1] = saved_emacs_keys[2];
-      keymap[6+1] = saved_emacs_keys[3];
-
-      did_emacs_keys = FALSE;
+    if (did_emacs_keys) {
+	reset_any_keys(emacs_keys_table, TABLESIZE(emacs_keys_table));
+	did_emacs_keys = FALSE;
+    }
 }
 
-static LYKeymap_t saved_number_keys[9];
+/*
+ * Map numbers to functions as labeled on the IBM Enhanced keypad, and save
+ * their original mapping for reset_numbers_as_arrows().  - FM
+ */
+static ANY_KEYS number_keys_table[] = {
+    { '1', LYK_END,        0 },
+    { '2', LYK_NEXT_LINK,  0 },
+    { '3', LYK_NEXT_PAGE,  0 },
+    { '4', LYK_PREV_DOC,   0 },
+    { '5', LYK_DO_NOTHING, 0 },
+    { '6', LYK_ACTIVATE,   0 },
+    { '7', LYK_HOME,       0 },
+    { '8', LYK_PREV_LINK,  0 },
+    { '9', LYK_PREV_PAGE,  0 },
+};
+
 static BOOLEAN did_number_keys;
 
 PUBLIC void set_numbers_as_arrows NOARGS
 {
-    /*
-     *  Map numbers to functions as labeled on the
-     *  IBM Enhanced keypad, and save their original
-     *  mapping for reset_numbers_as_arrows(). - FM
-     */
-    saved_number_keys[0] = keymap['4'+1];
-    keymap['4'+1] = LYK_PREV_DOC;
-    saved_number_keys[1] = keymap['2'+1];
-    keymap['2'+1] = LYK_NEXT_LINK;
-    saved_number_keys[2] = keymap['8'+1];
-    keymap['8'+1] = LYK_PREV_LINK;
-    saved_number_keys[3] = keymap['6'+1];
-    keymap['6'+1] = LYK_ACTIVATE;
-    saved_number_keys[4] = keymap['7'+1];
-    keymap['7'+1] = LYK_HOME;
-    saved_number_keys[5] = keymap['1'+1];
-    keymap['1'+1] = LYK_END;
-    saved_number_keys[6] = keymap['9'+1];
-    keymap['9'+1] = LYK_PREV_PAGE;
-    saved_number_keys[7] = keymap['3'+1];
-    keymap['3'+1] = LYK_NEXT_PAGE;
-
-    /*
-     *  Disable the 5.
-     */
-    saved_number_keys[8] = keymap['5'+1];
-    keymap['5'+1] = LYK_DO_NOTHING;
-
+    set_any_keys(number_keys_table, TABLESIZE(number_keys_table));
     did_number_keys = TRUE;
 }
 
 PUBLIC void reset_numbers_as_arrows NOARGS
 {
-    if (!did_number_keys)
-	return;
-
-    keymap['4'+1] = saved_number_keys[0];
-    keymap['2'+1] = saved_number_keys[1];
-    keymap['8'+1] = saved_number_keys[2];
-    keymap['6'+1] = saved_number_keys[3];
-    keymap['7'+1] = saved_number_keys[4];
-    keymap['1'+1] = saved_number_keys[5];
-    keymap['9'+1] = saved_number_keys[6];
-    keymap['3'+1] = saved_number_keys[7];
-    keymap['5'+1] = saved_number_keys[8];
-
-    did_number_keys = FALSE;
+    if (did_number_keys) {
+	reset_any_keys(number_keys_table, TABLESIZE(number_keys_table));
+	did_number_keys = FALSE;
+    }
 }
 
 PUBLIC char *key_for_func ARGS1 (
@@ -1660,6 +1656,7 @@ PUBLIC char *fmt_keys ARGS2(
     BOOLEAN quotes = FALSE;
     char *fmt_first;
     char *fmt_second;
+
     if (lkc_first < 0)
 	return NULL;
     fmt_first = LYKeycodeToString(lkc_first, TRUE);
diff --git a/src/LYKeymap.h b/src/LYKeymap.h
index 18db17c0..c159530e 100644
--- a/src/LYKeymap.h
+++ b/src/LYKeymap.h
@@ -229,9 +229,7 @@ typedef enum {
 #define LYK_TAG_LINK      LYK_UNKNOWN
 #endif /* DIRED_SUPPORT */
 
-#ifdef SH_EX
   , LYK_CHG_CENTER
-#endif /* SH_EX */
 
 #ifdef KANJI_CODE_OVERRIDE
   , LYK_CHG_KCODE
diff --git a/src/LYMain.c b/src/LYMain.c
index 8c6323cd..79cd47ab 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -314,11 +314,9 @@ PUBLIC BOOLEAN system_is_NT = FALSE;
 
 #ifdef SH_EX
 PUBLIC BOOLEAN show_cfg = FALSE;
-#ifdef WIN_EX
-PUBLIC int     debug_delay = 0;		/* 1998/10/06 (Tue) 08:41:20 */
 #endif
+
 PUBLIC BOOLEAN no_table_center = FALSE;	/* 1998/10/09 (Fri) 15:12:49 */
-#endif /* SH_EX */
 
 #if USE_BLAT_MAILER
 PUBLIC BOOLEAN mail_is_blat = TRUE;
@@ -422,6 +420,7 @@ PUBLIC char *system_mail_flags = NULL;	/* Flags for sending mail */
 PUBLIC char *x_display = NULL;		/* display environment variable */
 PUBLIC HistInfo history[MAXHIST];
 PUBLIC int AlertSecs;			/* time-delay for HTAlert() messages   */
+PUBLIC int DebugSecs;			/* time-delay for HTProgress messages */
 PUBLIC int InfoSecs;			/* time-delay for Information messages */
 PUBLIC int LYMultiBookmarks = MULTI_BOOKMARK_SUPPORT;
 PUBLIC int LYStatusLine = -1;		/* Line for statusline() if > -1 */
@@ -488,6 +487,12 @@ PUBLIC BOOLEAN LYPrependCharsetToSource = TRUE;
 PUBLIC BOOLEAN LYQuitDefaultYes = QUIT_DEFAULT_YES;
 PUBLIC BOOLEAN dont_wrap_pre = FALSE;
 
+PUBLIC int cookie_noprompt;
+
+#ifdef USE_SSL
+PUBLIC int ssl_noprompt = FORCE_PROMPT_DFT;
+#endif
+
 PUBLIC int connect_timeout = 18000; /*=180000*0.1 - used in HTDoConnect.*/
 
 #ifdef EXP_JUSTIFY_ELTS
@@ -1043,9 +1048,11 @@ PUBLIC int main ARGS2(
     StrAllocCopy(list_format, LIST_FORMAT);
 #endif /* !VMS */
 
+    AlertSecs	= SECS2Secs(ALERTSECS);
+    DebugSecs	= SECS2Secs(DEBUGSECS);
     InfoSecs	= SECS2Secs(INFOSECS);
     MessageSecs	= SECS2Secs(MESSAGESECS);
-    AlertSecs	= SECS2Secs(ALERTSECS);
+    ReplaySecs	= SECS2Secs(REPLAYSECS);
 
     StrAllocCopy(helpfile, HELPFILE);
     StrAllocCopy(startfile, STARTFILE);
@@ -2249,9 +2256,10 @@ PUBLIC void reload_read_cfg NOARGS
 
 PRIVATE void disable_pausing NOARGS
 {
+    AlertSecs = 0;
+    DebugSecs = 0;
     InfoSecs = 0;
     MessageSecs = 0;
-    AlertSecs = 0;
     ReplaySecs = 0;
 }
 
@@ -2290,10 +2298,12 @@ typedef struct parse_args_type
 #define LYSTRING_ARG		0x0050
 #define INT_ARG			0x0060
 #define STRING_ARG		0x0070
+#define TIME_ARG		0x0080
 #define ARG_TYPE_MASK		0x0FF0
 #define NEED_NEXT_ARG		0x1000
 
 #define NEED_INT_ARG		(NEED_NEXT_ARG | INT_ARG)
+#define NEED_TIME_ARG		(NEED_NEXT_ARG | TIME_ARG)
 #define NEED_LYSTRING_ARG	(NEED_NEXT_ARG | LYSTRING_ARG)
 #define NEED_STRING_ARG		(NEED_NEXT_ARG | STRING_ARG)
 #define NEED_FUNCTION_ARG	(NEED_NEXT_ARG | FUNCTION_ARG)
@@ -3072,33 +3082,20 @@ PRIVATE int version_fun ARGS1(
     printf("\n");
 #endif /* USE_SSL */
 
-#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");
-    printf(gettext(
-	  "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-	  ));
-    printf(gettext("Distributed under the GNU General Public License.\n"));
-    printf(gettext(
-	  "See http://lynx.browser.org/ and the online help for more information.\n\n"
-	  ));
-#ifdef USE_SSL
-    printf("See http://www.moxienet.com/lynx/ for information about SSL for Lynx.\n");
-#ifdef OPENSSL_VERSION_TEXT
-    printf("See http://www.openssl.org/ for information about OpenSSL.\n");
-#endif /* OPENSSL_VERSION_TEXT */
-    printf("\n");
-#endif /* USE_SSL */
 
-#ifdef SH_EX
+/*
+ * SYSTEM_NAME is set by the configure script.  Show build date/time for other
+ * systems, according to predefined compiler symbols.
+ */
+#ifdef SYSTEM_NAME
+    printf(gettext("Built on %s %s %s\n"), SYSTEM_NAME, __DATE__, __TIME__);
+#else
 #ifdef __CYGWIN__
     printf("Compiled by CYGWIN (%s %s).\n", __DATE__, __TIME__);
 #else
@@ -3116,7 +3113,23 @@ PRIVATE int version_fun ARGS1(
 #endif /* _MSC_VER */
 #endif /* __BORLANDC__ */
 #endif /* __CYGWIN__ */
-#endif /* SH_EX */
+#endif
+
+    printf("\n");
+    printf(gettext(
+	  "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+	  ));
+    printf(gettext("Distributed under the GNU General Public License.\n"));
+    printf(gettext(
+	  "See http://lynx.browser.org/ and the online help for more information.\n\n"
+	  ));
+#ifdef USE_SSL
+    printf("See http://www.moxienet.com/lynx/ for information about SSL for Lynx.\n");
+#ifdef OPENSSL_VERSION_TEXT
+    printf("See http://www.openssl.org/ for information about OpenSSL.\n");
+#endif /* OPENSSL_VERSION_TEXT */
+    printf("\n");
+#endif /* USE_SSL */
 
     SetOutputMode( O_BINARY );
 
@@ -3197,12 +3210,10 @@ PRIVATE Config_Type Arg_Table [] =
       "case",		4|SET_ARG,		case_sensitive,
       "enable case sensitive user searching"
    ),
-#ifdef SH_EX
    PARSE_SET(
       "center",		4|TOGGLE_ARG,		no_table_center,
-      "Toggle center alignment in HTML TABLE"
+      "toggle center alignment in HTML TABLE"
    ),
-#endif
    PARSE_STR(
       "cfg",		2|NEED_LYSTRING_ARG,	lynx_cfg_file,
       "=FILENAME\nspecifies a lynx.cfg file other than the default"
@@ -3274,12 +3285,10 @@ with -dump, format output as with -traversal, but to stdout"
       "incremental display stages with MessageSecs delay"
    ),
 #endif
-#if defined(SH_EX) && defined(WIN_EX)
    PARSE_INT(
-      "delay",		4|NEED_INT_ARG,		debug_delay,
-      "=NNN\nset the NNN msec delay at statusline message"
+      "delay",		4|NEED_TIME_ARG,	DebugSecs,
+      "=NNN\nset NNN-second delay at statusline message"
    ),
-#endif
    PARSE_FUN(
       "display",	4|NEED_FUNCTION_ARG,	display_fun,
       "=DISPLAY\nset the display variable for X exec'ed programs"
@@ -3852,6 +3861,9 @@ in double-quotes (\"-\") on VMS)", NULL, TRUE);
 	    case INT_ARG:
 		sprintf(temp, "%d", *(q->int_value));
 		break;
+	    case TIME_ARG:
+		sprintf(temp, SECS_FMT, (double) Secs2SECS(*(q->int_value)));
+		break;
 	    case STRING_ARG:
 		if ((value = *(q->str_value)) != 0
 		 && !*value)
@@ -4075,10 +4087,19 @@ PRIVATE BOOL parse_arg ARGS3(
 		 *(q->int_value) = strtol (next_arg, &temp_ptr, 0);
 	     break;
 
+	case TIME_ARG:
+	    if ((q->int_value != 0) && (next_arg != 0)) {
+		float ival;
+		if (1 == sscanf (next_arg, "%f", &ival)) {
+		    *(q->int_value) = (int) SECS2Secs(ival);
+		}
+	    }
+	    break;
+
 	case STRING_ARG:
-	     if ((q->str_value != 0) && (next_arg != 0))
+	    if ((q->str_value != 0) && (next_arg != 0))
 		*(q->str_value) = next_arg;
-	     break;
+	    break;
 	}
 
 	Old_DTD = DTD_recovery;	/* BOOL != int */
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 9b1145a9..e5c10bc7 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -78,16 +78,12 @@ PUBLIC char *str_kcode(HTkcode code)
 	}
     }
 
-#ifdef SH_EX	/* 1999/05/25 (Tue) 11:12:05 */
     if (no_table_center) {
 	buff[0] = '!';
 	strcpy(buff + 1, p);
     } else {
 	strcpy(buff, p);
     }
-#else
-    strcpy(buff, p);
-#endif
 
     return buff;
 }
@@ -398,18 +394,11 @@ PUBLIC int LYGetNewline NOARGS
 }
 
 #ifdef SOURCE_CACHE
-/*
- * To reparse current html document under the different settings we call
- * reparse_document() within mainloop refresh cycle, it relies upon 'curdoc'.
- *
- * From the other hand, regular requests for new document go to getfile()
- * and rely upon 'newdoc'.
- *
- * To work around newdoc.line/curdoc.line/www_search_target/Newline message
- * the following flag is introduced:
- */
 PRIVATE BOOLEAN from_source_cache = FALSE;
 
+/*
+ * Like HTreparse_document(), but also set the flag.
+ */
 PRIVATE BOOLEAN reparse_document NOARGS
 {
     BOOLEAN ok;
@@ -431,8 +420,7 @@ PRIVATE BOOLEAN reparse_or_reload ARGS1(
     int *,	cmd)
 {
 #ifdef SOURCE_CACHE
-    if (HTcan_reparse_document()) {
-	reparse_document();
+    if (reparse_document()) {
 	return FALSE;
     }
 #endif
@@ -471,6 +459,7 @@ PRIVATE void move_address ARGS2(
     free_address(src);
 }
 
+#ifdef DISP_PARTIAL
 /*
  * This is for traversal call from within partial mode in LYUtils.c
  * and HTFormat.c  It simply calls HText_pageDisplay() but utilizes
@@ -480,7 +469,6 @@ PRIVATE void move_address ARGS2(
 PUBLIC BOOL LYMainLoop_pageDisplay ARGS1(
 	int,		line_num)
 {
-#ifdef DISP_PARTIAL
     CONST char * pound;
     int prev_newline = Newline;
 
@@ -503,19 +491,15 @@ PUBLIC BOOL LYMainLoop_pageDisplay ARGS1(
 	 * If the requested URL has the #fragment, and we are not popped
 	 * from the history stack, and have not scrolled the document yet -
 	 * we should calculate correct newline position for the fragment.
+	 * (This is a bit suboptimal since HTFindPoundSelector() traverse
+	 * anchors list each time, so we have a quadratic complexity
+	 * and may load CPU in a worst case).
 	 */
 	if (display_partial
 	    && newdoc.line == 1 && line_num == 1 && prev_newline == 1
 	    && (pound = findPoundSelector(newdoc.address))
 	    && *pound && *(pound+1)) {
-
-	    HTChildAnchor sample;           /** 5 lines from HTAnchor.c **/
-	    sample.tag = (char*)pound+1;    /* for compare_anchors() only */
-
-	    if (HTMainAnchor         /* document is coming */
-		&& HTMainAnchor->children
-		&& HTBTree_search(HTMainAnchor->children, &sample) != NULL
-		&& HTFindPoundSelector(pound+1)) {
+	    if (HTFindPoundSelector(pound+1)) {
 		/* HTFindPoundSelector will initialize www_search_result */
 		Newline = www_search_result;
 	    } else {
@@ -523,11 +507,11 @@ PUBLIC BOOL LYMainLoop_pageDisplay ARGS1(
 		return NO;	/* no repaint */
 	    }
 	}
-#endif /* DISP_PARTIAL */
 
     HText_pageDisplay(Newline, prev_target);
     return YES;
 }
+#endif /* DISP_PARTIAL */
 
 
 PRIVATE void set_curdoc_link ARGS1(
@@ -2492,10 +2476,7 @@ PRIVATE void handle_LYK_DWIMHELP ARGS1(
     if (curdoc.link >= 0 && curdoc.link < nlinks &&
 	links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
 	!links[curdoc.link].l_form->disabled &&
-	(links[curdoc.link].l_form->type == F_TEXT_TYPE ||
-	 links[curdoc.link].l_form->type == F_TEXT_SUBMIT_TYPE ||
-	 links[curdoc.link].l_form->type == F_PASSWORD_TYPE ||
-	 links[curdoc.link].l_form->type == F_TEXTAREA_TYPE)) {
+	F_TEXTLIKE(links[curdoc.link].l_form->type)) {
 	*cshelpfile = LYLineeditHelpURL();
     }
 }
@@ -3102,10 +3083,7 @@ PRIVATE void handle_LYK_HISTORICAL NOARGS
 #ifdef SOURCE_CACHE
     } /* end if no bypass */
 #endif
-    if (historical_comments)
-	historical_comments = FALSE;
-    else
-	historical_comments = TRUE;
+    historical_comments = !historical_comments;
     if (minimal_comments) {
 	HTAlert(historical_comments ?
 		HISTORICAL_ON_MINIMAL_OFF : HISTORICAL_OFF_MINIMAL_ON);
@@ -3167,10 +3145,7 @@ PRIVATE BOOLEAN handle_LYK_HISTORY ARGS1(
 PRIVATE BOOLEAN handle_LYK_IMAGE_TOGGLE ARGS1(
     int *,	cmd)
 {
-    if (clickable_images)
-	clickable_images = FALSE;
-    else
-	clickable_images = TRUE;
+    clickable_images = !clickable_images;
 
     HTUserMsg(clickable_images ?
 	     CLICKABLE_IMAGES_ON : CLICKABLE_IMAGES_OFF);
@@ -3323,10 +3298,7 @@ PRIVATE BOOLEAN handle_LYK_INFO ARGS1(
 PRIVATE BOOLEAN handle_LYK_INLINE_TOGGLE ARGS1(
     int *,	cmd)
 {
-    if (pseudo_inline_alts)
-	pseudo_inline_alts = FALSE;
-    else
-	pseudo_inline_alts = TRUE;
+    pseudo_inline_alts = !pseudo_inline_alts;
 
     HTUserMsg(pseudo_inline_alts ?
 	      PSEUDO_INLINE_ALTS_ON : PSEUDO_INLINE_ALTS_OFF);
@@ -3620,20 +3592,17 @@ PRIVATE void handle_LYK_MINIMAL NOARGS
     } /* end if no bypass */
 #endif
     }
-    if (minimal_comments)
-	minimal_comments = FALSE;
-    else
-	minimal_comments = TRUE;
+    minimal_comments = !minimal_comments;
     if (!historical_comments) {
 	HTAlert(minimal_comments ?
 		MINIMAL_ON_IN_EFFECT : MINIMAL_OFF_VALID_ON);
-#ifdef SOURCE_CACHE
-	(void)reparse_document();
-#endif
     } else {
 	HTAlert(minimal_comments ?
 		MINIMAL_ON_BUT_HISTORICAL : MINIMAL_OFF_HISTORICAL_ON);
     }
+#ifdef SOURCE_CACHE
+    (void)reparse_document();
+#endif
     return;
 }
 
@@ -4010,7 +3979,7 @@ PRIVATE int handle_PREV_DOC ARGS3(
 	    WWWDoc.bookmark = HDOC(nhist - 1).bookmark;
 	    WWWDoc.isHEAD = HDOC(nhist - 1).isHEAD;
 	    WWWDoc.safe = HDOC(nhist - 1).safe;
-	    tmpanchor = HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+	    tmpanchor = HTAnchor_findAddress(&WWWDoc);
 	    if (HTAnchor_safe(tmpanchor)) {
 		break;
 	    }
@@ -4300,10 +4269,7 @@ PRIVATE void handle_LYK_SOFT_DQUOTES NOARGS
 #ifdef SOURCE_CACHE
     } /* end if no bypass */
 #endif
-    if (soft_dquotes)
-	soft_dquotes = FALSE;
-    else
-	soft_dquotes = TRUE;
+    soft_dquotes = !soft_dquotes;
     HTUserMsg(soft_dquotes ?
 	      SOFT_DOUBLE_QUOTE_ON : SOFT_DOUBLE_QUOTE_OFF);
 #ifdef SOURCE_CACHE
@@ -5490,7 +5456,7 @@ try_again:
 		    WWWDoc.bookmark = newdoc.bookmark;
 		    WWWDoc.isHEAD = newdoc.isHEAD;
 		    WWWDoc.safe = newdoc.safe;
-		    tmpanchor = HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+		    tmpanchor = HTAnchor_findAddress(&WWWDoc);
 		    if ((HText *)HTAnchor_document(tmpanchor) == NULL) {
 			if (!LYReopenTracelog(&trace_mode_flag)) {
 			    old_c = 0;
@@ -6385,10 +6351,7 @@ try_again:
 	curlink_is_editable =
 	    (nlinks > 0 &&
 	     links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	     (links[curdoc.link].l_form->type == F_TEXT_TYPE ||
-	      links[curdoc.link].l_form->type == F_TEXT_SUBMIT_TYPE ||
-	      links[curdoc.link].l_form->type == F_PASSWORD_TYPE ||
-	      links[curdoc.link].l_form->type == F_TEXTAREA_TYPE));
+	     F_TEXTLIKE(links[curdoc.link].l_form->type));
 
 	use_last_tfpos = (curlink_is_editable &&
 			  (real_cmd == LYK_LPOS_PREV_LINK ||
@@ -6864,7 +6827,6 @@ new_cmd:  /*
 	    handle_LYK_SOURCE(&ownerS_address);
 	    break;
 
-#ifdef SH_EX		/* 1999/01/01 (Fri) */
 	case LYK_CHG_CENTER:	/* ^Q */
 
 	    if (no_table_center) {
@@ -6874,8 +6836,8 @@ new_cmd:  /*
 		no_table_center = TRUE;
 		HTInfoMsg(gettext("TABLE center disable."));
 	    }
-#endif
 	    /* FALLTHRU */
+
 	case LYK_RELOAD:  /* control-R to reload and refresh */
 	    handle_LYK_RELOAD(real_cmd);
 	    break;
@@ -6975,6 +6937,11 @@ new_cmd:  /*
 		    s++;
 		while (s < e && strchr(" \t\n\r", e[-1]))
 		    e--;
+		if (s[0] == '<' && e > s && e[-1] == '>') {
+		    s++; e--;
+		    if (!strncasecomp(s,"URL:", 4))
+			s += 4;
+		}
 		if (s >= e) {
 		    HTInfoMsg(gettext("No URL in the clipboard."));
 		    break;
diff --git a/src/LYMainLoop.h b/src/LYMainLoop.h
index 6a548267..798f9d77 100644
--- a/src/LYMainLoop.h
+++ b/src/LYMainLoop.h
@@ -5,7 +5,9 @@
 #include <HTUtils.h>
 #endif
 
+#ifdef DISP_PARTIAL
 extern BOOL LYMainLoop_pageDisplay PARAMS((int line_num));
+#endif
 extern BOOLEAN LYOpenTraceLog NOPARAMS;
 extern char* LYDownLoadAddress NOPARAMS;
 extern int LYGetNewline NOPARAMS;
diff --git a/src/LYMap.c b/src/LYMap.c
index e90745be..c25898d1 100644
--- a/src/LYMap.c
+++ b/src/LYMap.c
@@ -341,7 +341,7 @@ PRIVATE void fill_DocAddress ARGS4(
 	wwwdoc->bookmark = NULL;
 	wwwdoc->isHEAD = FALSE;
 	wwwdoc->safe = FALSE;
-	underlying = HTAnchor_parent(HTAnchor_findAddress(wwwdoc));
+	underlying = HTAnchor_findAddress(wwwdoc);
 	if (underlying->safe)
 	    wwwdoc->safe = TRUE;
 	if (punderlying)
@@ -547,7 +547,7 @@ PRIVATE int LYLoadIMGmap ARGS4 (
     } else if (LYRequestTitle && *LYRequestTitle &&
 	       strcasecomp(LYRequestTitle, "[USEMAP]")) {
 	StrAllocCopy(MapTitle, LYRequestTitle);
-    } else if ((cp = strrchr(address, '#')) != NULL) {
+    } else if ((cp = strchr(address, '#')) != NULL) {
 	StrAllocCopy(MapTitle, (cp+1));
     }
     if (!(MapTitle && *MapTitle)) {
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 17c2d128..0c5970a3 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -2176,6 +2176,21 @@ static char * show_cursor_string	= RC_SHOW_CURSOR;
 static char * show_scrollbar_string	= RC_SCROLLBAR;
 #endif
 
+static CONST char prompt_dft_string[]	= "prompt normally";
+static CONST char prompt_yes_string[]	= "force yes-response";
+static CONST char prompt_no_string[]	= "force no-response";
+static OptValues prompt_values[] = {
+	{ FORCE_PROMPT_DFT,	prompt_dft_string, prompt_dft_string },
+	{ FORCE_PROMPT_YES,	prompt_yes_string, prompt_yes_string },
+	{ FORCE_PROMPT_NO,	prompt_no_string,  prompt_no_string },
+	{ 0, 0, 0 }};
+
+static char * cookie_prompt_string	= RC_FORCE_COOKIE_PROMPT;
+
+#ifdef USE_SSL
+static char * ssl_prompt_string		= RC_FORCE_SSL_PROMPT;
+#endif
+
 static char * user_mode_string		= RC_USER_MODE;
 static OptValues user_mode_values[] = {
 	{ NOVICE_MODE,		"Novice",	"Novice" },
@@ -2710,6 +2725,16 @@ PUBLIC int postoptions ARGS1(
 	}
 #endif
 
+	/* Cookie Prompting: SELECT */
+	if (!strcmp(data[i].tag, cookie_prompt_string))
+	    GetOptValues(prompt_values, data[i].value, &cookie_noprompt);
+
+#ifdef USE_SSL
+	/* SSL Prompting: SELECT */
+	if (!strcmp(data[i].tag, ssl_prompt_string))
+	    GetOptValues(prompt_values, data[i].value, &ssl_noprompt);
+#endif
+
 	/* User Mode: SELECT */
 	if (!strcmp(data[i].tag, user_mode_string)
 	 && GetOptValues(user_mode_values, data[i].value, &user_mode)) {
@@ -3255,6 +3280,9 @@ PRIVATE int gen_options ARGS1(
     PutOptValues(fp0, case_sensitive, search_type_values);
     EndSelect(fp0);
 
+    fprintf(fp0,"\n  <em>%s</em>\n", gettext("Security and Privacy"));
+    /*****************************************************************/
+
     /* Cookies: SELECT */
     PutLabel(fp0, gettext("Cookies"), will_save_cookies());
     BeginSelect(fp0, cookies_string);
@@ -3269,6 +3297,19 @@ PRIVATE int gen_options ARGS1(
 		   cookies_accept_all_string);
     EndSelect(fp0);
 
+    /* Cookie Prompting: SELECT */
+    PutLabel(fp0, gettext("Invalid-Cookie Prompting"), cookie_prompt_string);
+    BeginSelect(fp0, cookie_prompt_string);
+    PutOptValues(fp0, cookie_noprompt, prompt_values);
+    EndSelect(fp0);
+
+#ifdef USE_SSL
+    /* SSL Prompting: SELECT */
+    PutLabel(fp0, gettext("SSL Prompting"), ssl_prompt_string);
+    BeginSelect(fp0, ssl_prompt_string);
+    PutOptValues(fp0, ssl_noprompt, prompt_values);
+    EndSelect(fp0);
+#endif
 
     fprintf(fp0,"\n  <em>%s</em>\n", gettext("Keyboard Input"));
     /*****************************************************************/
diff --git a/src/LYPrint.c b/src/LYPrint.c
index b9b69849..e85706e1 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -157,7 +157,7 @@ PRIVATE void SetupFilename ARGS2(
 	format = HTFileFormat(filename, &encoding, NULL);
 	if (!strcasecomp(format->name, "text/html") ||
 	    !IsUnityEnc(encoding)) {
-	    strcpy(cp, ".txt");
+	    strcpy(cp, TEXT_SUFFIX);
 	}
     }
 }
@@ -564,14 +564,14 @@ PRIVATE void send_file_to_mail ARGS3(
     outfile_fp = LYOpenTemp(my_temp,
 			    (HTisDocumentSource())
 				    ? HTML_SUFFIX
-				    : ".txt",
+				    : TEXT_SUFFIX,
 			    "w");
     if (outfile_fp == NULL) {
 	CannotPrint(UNABLE_TO_OPEN_TEMPFILE);
     }
 
     if (isPMDF) {
-	if ((hfd = LYOpenTemp(hdrfile, ".txt", "w")) == NULL) {
+	if ((hfd = LYOpenTemp(hdrfile, TEXT_SUFFIX, "w")) == NULL) {
 	    CannotPrint(UNABLE_TO_OPEN_TEMPFILE);
 	}
 	if (use_type) {
@@ -678,7 +678,7 @@ PRIVATE void send_file_to_mail ARGS3(
 #if CAN_PIPE_TO_MAILER
     outfile_fp = LYPipeToMailer();
 #else
-    outfile_fp = LYOpenTemp(my_temp, ".txt", "w");
+    outfile_fp = LYOpenTemp(my_temp, TEXT_SUFFIX, "w");
 #endif
     if (outfile_fp == NULL) {
 	CannotPrint(MAIL_REQUEST_FAILED);
@@ -813,7 +813,7 @@ PRIVATE void send_file_to_printer ARGS4(
     outfile_fp = LYOpenTemp(my_temp,
 			    (HTisDocumentSource())
 				    ? HTML_SUFFIX
-				    : ".txt",
+				    : TEXT_SUFFIX,
 			    "w");
     if (outfile_fp == NULL) {
 	CannotPrint(FILE_ALLOC_FAILED);
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 21507b30..c19d1787 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1264,10 +1264,11 @@ PRIVATE Config_Type Config_Table [] =
      PARSE_STR(RC_COOKIE_SAVE_FILE,     LYCookieSaveFile),
 #endif /* EXP_PERSISTENT_COOKIES */
      PARSE_STR(RC_COOKIE_STRICT_INVALID_DOMAIN, LYCookieSStrictCheckDomains),
-     PARSE_Env(RC_CSO_PROXY, 0 ),
+     PARSE_Env(RC_CSO_PROXY,		0),
 #ifdef VMS
      PARSE_PRG(RC_CSWING_PATH,          ppCSWING),
 #endif
+     PARSE_TIM(RC_DELAYSECS,            DebugSecs),
      PARSE_FUN(RC_DEFAULT_BOOKMARK_FILE, default_bookmark_file_fun),
      PARSE_FUN(RC_DEFAULT_CACHE_SIZE,   default_cache_size_fun),
      PARSE_FUN(RC_DEFAULT_EDITOR,       default_editor_fun),
@@ -1291,21 +1292,25 @@ PRIVATE Config_Type Config_Table [] =
 #ifdef USE_EXTERNALS
      PARSE_ADD(RC_EXTERNAL,             externals),
 #endif
-     PARSE_Env(RC_FINGER_PROXY,         0 ),
+     PARSE_Env(RC_FINGER_PROXY,         0),
 #if defined(_WINDOWS)	/* 1998/10/05 (Mon) 17:34:15 */
      PARSE_SET(RC_FOCUS_WINDOW,         focus_window),
 #endif
      PARSE_SET(RC_FORCE_8BIT_TOUPPER,   UCForce8bitTOUPPER),
+     PARSE_ENU(RC_FORCE_COOKIE_PROMPT,  cookie_noprompt, tbl_force_prompt),
      PARSE_SET(RC_FORCE_EMPTY_HREFLESS_A, force_empty_hrefless_a),
      PARSE_SET(RC_FORCE_SSL_COOKIES_SECURE, LYForceSSLCookiesSecure),
+#ifdef USE_SSL
+     PARSE_ENU(RC_FORCE_SSL_PROMPT,     ssl_noprompt, tbl_force_prompt),
+#endif
 #if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU)
      PARSE_SET(RC_FORMS_OPTIONS,        LYUseFormsOptions),
 #endif
      PARSE_SET(RC_FTP_PASSIVE,          ftp_passive),
-     PARSE_Env(RC_FTP_PROXY,            0 ),
+     PARSE_Env(RC_FTP_PROXY,            0),
      PARSE_STR(RC_GLOBAL_EXTENSION_MAP, global_extension_map),
      PARSE_STR(RC_GLOBAL_MAILCAP,       global_type_map),
-     PARSE_Env(RC_GOPHER_PROXY,         0 ),
+     PARSE_Env(RC_GOPHER_PROXY,         0),
      PARSE_SET(RC_GOTOBUFFER,           goto_buffer),
      PARSE_PRG(RC_GZIP_PATH,            ppGZIP),
      PARSE_STR(RC_HELPFILE,             helpfile),
@@ -1317,8 +1322,8 @@ PRIVATE Config_Type Config_Table [] =
      PARSE_FUN(RC_HTMLSRC_ATTRNAME_XFORM, read_htmlsrc_attrname_xform),
      PARSE_FUN(RC_HTMLSRC_TAGNAME_XFORM, read_htmlsrc_tagname_xform),
 #endif
-     PARSE_Env(RC_HTTP_PROXY,           0 ),
-     PARSE_Env(RC_HTTPS_PROXY,          0 ),
+     PARSE_Env(RC_HTTP_PROXY,           0),
+     PARSE_Env(RC_HTTPS_PROXY,          0),
      PARSE_REQ(RC_INCLUDE,              0),
      PARSE_TIM(RC_INFOSECS,             InfoSecs),
      PARSE_PRG(RC_INSTALL_PATH,         ppINSTALL),
@@ -1386,11 +1391,9 @@ PRIVATE Config_Type Config_Table [] =
 #endif
      PARSE_SET(RC_NO_FROM_HEADER,       LYNoFromHeader),
      PARSE_SET(RC_NO_ISMAP_IF_USEMAP,   LYNoISMAPifUSEMAP),
-     PARSE_Env(RC_NO_PROXY,             0 ),
+     PARSE_Env(RC_NO_PROXY,             0),
      PARSE_SET(RC_NO_REFERER_HEADER,    LYNoRefererHeader),
-#ifdef SH_EX
      PARSE_SET(RC_NO_TABLE_CENTER,      no_table_center),
-#endif
      PARSE_FUN(RC_NONRESTARTING_SIGWINCH, nonrest_sigwinch_fun),
      PARSE_FUN(RC_OUTGOING_MAIL_CHARSET, outgoing_mail_charset_fun),
 #ifdef DISP_PARTIAL
@@ -1435,9 +1438,9 @@ PRIVATE Config_Type Config_Table [] =
      PARSE_SET(RC_SET_COOKIES,          LYSetCookies),
      PARSE_SET(RC_SHOW_CURSOR,          LYShowCursor),
      PARSE_ENU(RC_SHOW_KB_RATE,         LYTransferRate, tbl_transfer_rate),
-     PARSE_Env(RC_SNEWS_PROXY,          0 ),
-     PARSE_Env(RC_SNEWSPOST_PROXY,      0 ),
-     PARSE_Env(RC_SNEWSREPLY_PROXY,     0 ),
+     PARSE_Env(RC_SNEWS_PROXY,          0),
+     PARSE_Env(RC_SNEWSPOST_PROXY,      0),
+     PARSE_Env(RC_SNEWSREPLY_PROXY,     0),
      PARSE_SET(RC_SOFT_DQUOTES,         soft_dquotes),
 #ifdef SOURCE_CACHE
      PARSE_ENU(RC_SOURCE_CACHE,         LYCacheSource, tbl_source_cache),
@@ -1487,7 +1490,7 @@ PRIVATE Config_Type Config_Table [] =
      PARSE_SET(RC_VERBOSE_IMAGES,       verbose_img),
      PARSE_SET(RC_VI_KEYS_ALWAYS_ON,    vi_keys),
      PARSE_FUN(RC_VIEWER,               viewer_fun),
-     PARSE_Env(RC_WAIS_PROXY,           0 ),
+     PARSE_Env(RC_WAIS_PROXY,           0),
      PARSE_STR(RC_XLOADIMAGE_COMMAND,   XLoadImageCommand),
      PARSE_PRG(RC_ZCAT_PATH,            ppZCAT),
      PARSE_PRG(RC_ZIP_PATH,             ppZIP),
diff --git a/src/LYStrings.c b/src/LYStrings.c
index e29f6495..a47d9356 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -388,6 +388,10 @@ PRIVATE int set_clicked_link ARGS4(
 	mouse_link = -2;
 	if (x == 0 && toolbar)		/* On '#' */
 	    c = LAC_TO_LKC0(LYK_TOOLBAR);
+#if defined(CAN_CUT_AND_PASTE) && defined(USE_COLOR_STYLE)
+	else if (y == 0 && x == LYcols - 1 && s_hot_paste != NOSTYLE)
+	    c = LAC_TO_LKC0(LYK_PASTE_URL);
+#endif
 	else if (clicks > 1) {
 	    if (x < left + toolbar)
 		c = (code==FOR_PROMPT && y)
@@ -5685,7 +5689,7 @@ PUBLIC int LYReadCmdKey ARGS1(
     } else {
 	ch = LYgetch_for(mode);
     }
-    CTRACE((tfp, "LYReadCmdKey(%d) ->%c (%#x)\n", mode, ch, ch));
+    CTRACE((tfp, "LYReadCmdKey(%d) ->%s (%#x)\n", mode, LYKeycodeToString(ch, TRUE), ch));
     LYWriteCmdKey(ch);
     return ch;
 }
diff --git a/src/LYStyle.c b/src/LYStyle.c
index b6d71ea2..16ab70d3 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -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.51 Wed, 22 Jan 2003 01:43:13 -0800 dickey @
+ * @Id: LYStyle.c 1.52 Sun, 01 Jun 2003 18:16:28 -0700 dickey @
  */
 #include <HTUtils.h>
 #include <HTML.h>
@@ -59,6 +59,13 @@ PUBLIC int s_alert		= NOSTYLE;
 PUBLIC int s_alink		= NOSTYLE;
 PUBLIC int s_curedit		= NOSTYLE;
 PUBLIC int s_forw_backw		= NOSTYLE;
+PUBLIC int s_hot_paste		= NOSTYLE;
+PUBLIC int s_menu_active	= NOSTYLE;
+PUBLIC int s_menu_bg		= NOSTYLE;
+PUBLIC int s_menu_entry		= NOSTYLE;
+PUBLIC int s_menu_frame		= NOSTYLE;
+PUBLIC int s_menu_number	= NOSTYLE;
+PUBLIC int s_menu_sb		= NOSTYLE;
 PUBLIC int s_normal		= NOSTYLE;
 PUBLIC int s_prompt_edit	= NOSTYLE;
 PUBLIC int s_prompt_edit_arr	= NOSTYLE;
@@ -67,12 +74,6 @@ PUBLIC int s_prompt_sel		= NOSTYLE;
 PUBLIC int s_status		= NOSTYLE;
 PUBLIC int s_title		= NOSTYLE;
 PUBLIC int s_whereis		= NOSTYLE;
-PUBLIC int s_menu_frame		= NOSTYLE;
-PUBLIC int s_menu_bg		= NOSTYLE;
-PUBLIC int s_menu_number	= NOSTYLE;
-PUBLIC int s_menu_entry		= NOSTYLE;
-PUBLIC int s_menu_active	= NOSTYLE;
-PUBLIC int s_menu_sb		= NOSTYLE;
 
 #ifdef USE_SCROLLBAR
 PUBLIC int s_sb_aa		= NOSTYLE;
@@ -250,6 +251,7 @@ PRIVATE void parse_style ARGS1(char*, param)
 	{ "edit.prompt.marked",	DSTYLE_ELEMENTS,	&s_prompt_sel },
 	{ "edit.prompt",	DSTYLE_ELEMENTS,	&s_prompt_edit },
 	{ "forwbackw.arrow",	DSTYLE_ELEMENTS,	&s_forw_backw },
+	{ "hot.paste",		DSTYLE_ELEMENTS,	&s_hot_paste },
 	{ "menu.frame",		DSTYLE_ELEMENTS,	&s_menu_frame },
 	{ "menu.bg",		DSTYLE_ELEMENTS,	&s_menu_bg },
 	{ "menu.n",		DSTYLE_ELEMENTS,	&s_menu_number },
diff --git a/src/LYUtils.c b/src/LYUtils.c
index f4109c7e..ff2ede72 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -109,10 +109,6 @@ extern int BSDselect PARAMS((int nfds, fd_set * readfds, fd_set * writefds,
 #endif /* SOCKS */
 #endif /* SVR4_BSDSELECT */
 
-#ifndef FD_SETSIZE
-#define FD_SETSIZE 256
-#endif /* !FD_SETSIZE */
-
 #ifdef __DJGPP__
 #undef select			/* defined to select_s in www_tcp.h */
 #endif
@@ -1574,16 +1570,16 @@ PUBLIC int HTCheckForInterrupt NOARGS
 #else /* Unix curses: */
 
     socket_timeout.tv_sec = 0;
-    socket_timeout.tv_usec = 100;
+    socket_timeout.tv_usec = 0;
     FD_ZERO(&readfds);
     FD_SET(0, &readfds);
 #ifdef SOCKS
     if (socks_flag)
-	ret = Rselect(FD_SETSIZE, (void *)&readfds, NULL, NULL,
+	ret = Rselect(1, (void *)&readfds, NULL, NULL,
 		      &socket_timeout);
     else
 #endif /* SOCKS */
-	ret = select(FD_SETSIZE, (void *)&readfds, NULL, NULL,
+	ret = select(1, (void *)&readfds, NULL, NULL,
 		     &socket_timeout);
 
     /** Suspended? **/
@@ -1620,7 +1616,7 @@ PUBLIC int HTCheckForInterrupt NOARGS
 
     /** Curses or slang setup was not invoked **/
     if (DontCheck())
-	  return((int)FALSE);
+	return((int)FALSE);
 
     /** Control-C or Control-Y and a 'N'o reply to exit query **/
     if (HadVMSInterrupt) {
@@ -1788,7 +1784,7 @@ PUBLIC BOOLEAN LYisAbsPath ARGS1(
  * Check if the given filename is the root path, e.g., "/" on Unix.
  */
 PUBLIC BOOLEAN LYisRootPath ARGS1(
-	char *,		path)
+	CONST char *,		path)
 {
 #if defined(USE_DOS_DRIVES)
     if (strlen(path) == 3
@@ -1804,7 +1800,7 @@ PUBLIC BOOLEAN LYisRootPath ARGS1(
  *  Return YES only if we're certain it's a local file. - FM
  */
 PUBLIC BOOLEAN LYisLocalFile ARGS1(
-	char *,		filename)
+	CONST char *,		filename)
 {
     char *host = NULL;
     char *acc_method = NULL;
@@ -1842,7 +1838,7 @@ PUBLIC BOOLEAN LYisLocalFile ARGS1(
  *  Return YES only if we're certain it's the local host. - FM
  */
 PUBLIC BOOLEAN LYisLocalHost ARGS1(
-	char *,		filename)
+	CONST char *,		filename)
 {
     char *host = NULL;
     char *cp;
@@ -1918,7 +1914,7 @@ PUBLIC void LYAddLocalhostAlias ARGS1(
  *  Return YES only if we've listed the host as a local alias. - FM
  */
 PUBLIC BOOLEAN LYisLocalAlias ARGS1(
-	char *,		filename)
+	CONST char *,		filename)
 {
     char *host = NULL;
     char *alias;
@@ -6719,6 +6715,8 @@ PUBLIC void BeginInternalPage ARGS3(
 	char*, Title,
 	char*, HelpURL)
 {
+    fprintf(fp0, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
+
     fprintf(fp0, "<html>\n<head>\n");
     LYAddMETAcharsetToFD(fp0, -1);
     if (LYIsListpageTitle(Title)) {
diff --git a/src/LYUtils.h b/src/LYUtils.h
index a4e7e545..4c030db4 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -113,10 +113,10 @@ extern BOOLEAN LYFixCursesOnForAccess PARAMS((CONST char* addr, CONST char* phys
 extern BOOLEAN LYPathOffHomeOK PARAMS((char *fbuffer, size_t fbuffer_size));
 extern BOOLEAN LYValidateFilename PARAMS((char * result, char * given));
 extern BOOLEAN LYisAbsPath PARAMS((CONST char *path));
-extern BOOLEAN LYisLocalAlias PARAMS((char *filename));
-extern BOOLEAN LYisLocalFile PARAMS((char *filename));
-extern BOOLEAN LYisLocalHost PARAMS((char *filename));
-extern BOOLEAN LYisRootPath PARAMS((char *path));
+extern BOOLEAN LYisLocalAlias PARAMS((CONST char *filename));
+extern BOOLEAN LYisLocalFile PARAMS((CONST char *filename));
+extern BOOLEAN LYisLocalHost PARAMS((CONST char *filename));
+extern BOOLEAN LYisRootPath PARAMS((CONST char *path));
 extern BOOLEAN inlocaldomain NOPARAMS;
 extern CONST char *Home_Dir NOPARAMS;
 extern CONST char *index_to_restriction PARAMS((int inx));
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index 97179ca8..e8ae7fe6 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -121,6 +121,13 @@ PRIVATE Config_Enum tbl_visited_links[] = {
     { NULL,		DEFAULT_VISITED_LINKS }
 };
 
+PUBLIC Config_Enum tbl_force_prompt[] = {
+    { "default",	FORCE_PROMPT_DFT	},
+    { "yes",		FORCE_PROMPT_YES	},
+    { "no",		FORCE_PROMPT_NO		},
+    { NULL,		-1			}
+};
+
 PRIVATE BOOL getBool ARGS1(char *, src)
 {
     return (BOOL) (!strncasecomp(src, "on", 2) || !strncasecomp(src, "true", 4));
@@ -203,7 +210,7 @@ typedef enum {
 typedef struct config_type
 {
     CONST char *name;
-    int enabled;		/* see lynx.cfg ENABLE_LYNXRC */
+    int enabled;		/* see lynx.cfg ENABLE_LYNXRC "off" lines */
     Conf_Types type;
     ParseData;
     char **strings;
@@ -369,6 +376,12 @@ file lists such as FTP directories.  The options are:\n\
    BY_SIZE     -- sorts on the size of the file\n\
    BY_DATE     -- sorts on the date of the file\n\
 ")),
+    MAYBE_ENU(RC_FORCE_COOKIE_PROMPT,   cookie_noprompt,    tbl_force_prompt,
+	      MSG_ENABLE_LYNXRC),
+#ifdef USE_SSL
+    MAYBE_ENU(RC_FORCE_SSL_PROMPT,      ssl_noprompt,       tbl_force_prompt,
+	      MSG_ENABLE_LYNXRC),
+#endif
 #ifdef EXP_KEYBOARD_LAYOUT
     PARSE_ARY(RC_KBLAYOUT,              current_layout,     LYKbLayoutNames, NULL),
 #endif
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index 590436ce..8718bfbd 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -54,6 +54,7 @@
 #define RC_DEFAULT_USER_MODE            "default_user_mode"
 #define RC_DEFAULT_VIRTUAL_MEMORY_SIZE  "default_virtual_memory_size"
 #define RC_DEFINE RC_XLOADIMAGE_COMMAND "XLOADIMAGE_COMMAND"
+#define RC_DELAYSECS                    "delaysecs"
 #define RC_DIRED_MENU                   "dired_menu"
 #define RC_DIR_LIST_ORDER               "dir_list_order"
 #define RC_DIR_LIST_STYLE               "dir_list_style"
@@ -70,8 +71,10 @@
 #define RC_FINGER_PROXY                 "finger_proxy"
 #define RC_FOCUS_WINDOW                 "focus_window"
 #define RC_FORCE_8BIT_TOUPPER           "force_8bit_toupper"
+#define RC_FORCE_COOKIE_PROMPT          "force_cookie_prompt"
 #define RC_FORCE_EMPTY_HREFLESS_A       "force_empty_hrefless_a"
 #define RC_FORCE_SSL_COOKIES_SECURE     "force_ssl_cookies_secure"
+#define RC_FORCE_SSL_PROMPT             "force_ssl_prompt"
 #define RC_FORMS_OPTIONS                "forms_options"
 #define RC_FTP_PASSIVE                  "ftp_passive"
 #define RC_FTP_PROXY                    "ftp_proxy"
@@ -227,6 +230,7 @@
 #define RC_ZIP_PATH                     "zip_path"
 
 extern Config_Enum tbl_DTD_recovery[];
+extern Config_Enum tbl_force_prompt[];
 extern Config_Enum tbl_keypad_mode[];
 extern Config_Enum tbl_multi_bookmarks[];
 extern Config_Enum tbl_transfer_rate[];
diff --git a/src/TRSTable.c b/src/TRSTable.c
index 598d051f..f905f68c 100644
--- a/src/TRSTable.c
+++ b/src/TRSTable.c
@@ -79,10 +79,10 @@ typedef struct _STable_cellinfo {
 				   contentless cells (and cells we do
 				   not want to measure and count?),
 				   line-of-the-start otherwise.  */
-	int	pos;		/* column where cell starts */
-	int	len;		/* number of character positions */
-	int	colspan;	/* number of columns to span */
-	int	alignment;	/* one of HT_LEFT, HT_CENTER, HT_RIGHT,
+	short	pos;		/* column where cell starts */
+	short	len;		/* number of character positions */
+	short	colspan;	/* number of columns to span */
+	short	alignment;	/* one of HT_LEFT, HT_CENTER, HT_RIGHT,
 				   or RESERVEDCELL */
 } STable_cellinfo;
 
@@ -98,12 +98,13 @@ enum ended_state {
 #define OFFSET_IS_VALID			8
 #define OFFSET_IS_VALID_LAST_CELL	0x10
 #define BELIEVE_OFFSET			0x20
+#define IS_CONTINUATION_OF_MULTICELL	0x40
 
 typedef struct _STable_rowinfo {
     /* Each row may be displayed on many display lines, but we fix up
        positions of cells on this display line only: */
 	int	Line;		/* lineno in doc (zero-based) */
-	int	ncells;		/* number of table cells */
+	short	ncells;		/* number of table cells */
 
     /* What is the meaning of this?!  It is set if:
        [search for	def of fixed_line	below]
@@ -127,14 +128,14 @@ typedef struct _STable_rowinfo {
        REMARK: If this variable is not set, but icell_core is, Line is
        reset to the line of icell_core.
      */
-	BOOL	fixed_line;	/* if we have a 'core' line of cells */
+	short	fixed_line;	/* if we have a 'core' line of cells */
 	enum ended_state ended;	/* if we saw </tr> etc */
-	int	content;	/* Whether contains end-of-cell etc */
-	int	offset;		/* >=0 after line break in a multiline cell */
-	int	allocated;	/* number of table cells allocated or 0
+	short	content;	/* Whether contains end-of-cell etc */
+	short	offset;		/* >=0 after line break in a multiline cell */
+	short	allocated;	/* number of table cells allocated or 0
 				   if the .cells should not be free()ed */
+	short	alignment;	/* global align attribute for this row */
 	STable_cellinfo * cells;
-	int	alignment;	/* global align attribute for this row */
 } STable_rowinfo;
 
 struct _STable_chunk;
@@ -1365,11 +1366,17 @@ PRIVATE int Stbl_fakeFinishCellInTable ARGS4(
 	int prev_reserved_last = -1;
 	STable_rowinfo *prev_row;
 	int prev_row_n2 = lastrow - me->rows;
+	int is_multicell = 0;
 
 	CTRACE2(TRACE_TRST,
 		(tfp, "TRST:Stbl_fakeFinishCellInTable(lineno=%d, finishing=%d) START FAKING\n",
 		      lineno, finishing));
 
+	if ( lastrow->ncells > 1
+	     && (lastrow->cells[lastrow->ncells - 2].pos
+		 != lastrow->cells[lastrow->ncells - 1].pos))
+	    is_multicell = 1;
+
 	/* Although here we use pos=0, this may commit the previous
 	   cell which had <BR> as a last element.  This may overflow
 	   the screen width, so the additional checks performed in
@@ -1391,6 +1398,10 @@ PRIVATE int Stbl_fakeFinishCellInTable ARGS4(
 	}
 	lastrow = me->rows + (me->nrows - 1);
 	lastrow->content = IS_CONTINUATION_OF_CELL;
+	if (is_multicell)
+	    lastrow->content = IS_CONTINUATION_OF_MULTICELL;
+	else
+	    lastrow->content = IS_CONTINUATION_OF_CELL;
 	for (i = 0; i < lastrow->allocated; i++) {
 	    if (lastrow->cells[i].alignment == RESERVEDCELL) {
 		need_reserved = 1;
@@ -1679,10 +1690,23 @@ PUBLIC int Stbl_trimFakeRows ARGS3(
 	return 0;
     if ( prevrow->ended != ROW_ended_by_splitline) /* Lastrow non-fake */
 	return 0;
-    /* XXXX should remove duplicate RESERVED stuff too */
     me->nrows--;
-    if (lastrow->cells && lastrow->allocated == 0) /* Moved to pool */
-	lastrow->cells = NULL;
+    /* prevrow is now the last row, so its cells should be realloc()able */
+    if (prevrow->cells && prevrow->allocated == 0) { /* Moved to pool */
+	int c = prevrow->ncells;
+	STable_cellinfo *p;
+
+	if (lastrow->allocated > c)	/* May have RESERVED info */
+	    c = lastrow->allocated;
+	p = malloc(c * sizeof(STable_cellinfo));
+	memcpy(p, prevrow->cells, prevrow->ncells * sizeof(STable_cellinfo));
+	/* Copy back the possibly present RESERVED info.
+	   XXXX remove duplicated RESERVED stuff from the followup rows too! */
+	memcpy(p + prevrow->ncells, lastrow->cells + prevrow->ncells,
+	       (c - prevrow->ncells) * sizeof(STable_cellinfo));
+	prevrow->cells = p;	/* XXXX How would ride with RESERVED? */
+	prevrow->allocated = c;
+    }
     lastrow->ncells = 0;
     lastrow->content = 0;
     prevrow->ended = ROW_not_ended;	/* Give it new life */
diff --git a/userdefs.h b/userdefs.h
index 84380502..81a70769 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -906,6 +906,9 @@
 #define MESSAGESECS 2
 #define ALERTSECS 3
 
+#define DEBUGSECS 0
+#define REPLAYSECS 0
+
 /******************************
  * SHOW_COLOR controls whether the program displays in color by default.
  */
@@ -1347,11 +1350,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.5dev.15"
+#define LYNX_VERSION "2.8.5dev.16"
 #define LYNX_WWW_HOME "http://lynx.browser.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sun, 27 Apr 2003 17:38:00 -0700"
+#define LYNX_DATE "Sun, 01 Jun 2003 18:16:28 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 
@@ -1379,6 +1382,9 @@
 #define HTML_SUFFIX ".html"
 #endif
 
+#define BIN_SUFFIX  ".bin"
+#define TEXT_SUFFIX ".txt"
+
 #ifdef VMS
 /*
 **  Use the VMS port of gzip for uncompressing both .Z and .gz files.
author	Thomas E. Dickey <dickey@invisible-island.net>	2003-06-02 01:32:28 -0400
committer	Thomas E. Dickey <dickey@invisible-island.net>	2003-06-02 01:32:28 -0400
commit	6bbc5d0bfc53e1fbe69f916504c008e1b74b0b19 (patch)
tree	feebae850ee453021e05860f09ee7f7f4eac7651
parent	03413d1c868839950b21fd0b10fa5f31fff83964 (diff)
download	lynx-snapshots-6bbc5d0bfc53e1fbe69f916504c008e1b74b0b19.tar.gz