about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES13
-rw-r--r--WWW/Library/vms/descrip.mms98
-rwxr-xr-xconfigure2
-rw-r--r--configure.in4
-rw-r--r--descrip.mms83
-rw-r--r--lynx.cfg32
-rw-r--r--lynx_help/Lynx_users_guide.html2
-rw-r--r--po/da.po77
-rw-r--r--samples/blue-background.lss2
-rw-r--r--samples/lynx.lss2
-rw-r--r--samples/mild-colors.lss2
-rwxr-xr-xsamples/oldlynx20
-rw-r--r--src/AttrList.h1
-rw-r--r--src/LYCurses.c147
-rw-r--r--src/LYGlobalDefs.h4
-rw-r--r--src/LYMain.c4
-rw-r--r--src/LYReadCFG.c72
-rw-r--r--src/LYReadCFG.h4
-rw-r--r--src/LYStyle.c3
-rw-r--r--src/LYrcFile.h1
-rw-r--r--src/descrip.mms126
-rw-r--r--userdefs.h4
22 files changed, 362 insertions, 341 deletions
diff --git a/CHANGES b/CHANGES
index 2de48a70..ce3cebfb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,19 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2006-09-18 (2.8.6pre.4)
+* updated link in user's guide to HTML 3.0 reference (report by TH) -TD
+* remove coloring for lh- and high-tags from LYStyle.c and sample ".lss" files
+  since that tag is nonstandard (report by TH) -TD
+* update da.po from
+    http://www.iro.umontreal.ca/translation/maint/lynx/
+* add script samples/oldlynx, which gives the non-color-style scheme using
+  an executable built for color-style -TD
+* add DEFAULT_COLORS item to lynx.cfg to allow disabling the default colors
+  feature at runtime, allowing better matching of old color scheme via a
+  script -TD
+* update VMS descrip.mms files, adding the ability to build with slang -TD
+
 2006-09-10 (2.8.6pre.3)
 * add NESTED_TABLES setting to lynx.cfg to allow site override of the built-in
   default (see 2001-08-15 comments by TH) -TD
diff --git a/WWW/Library/vms/descrip.mms b/WWW/Library/vms/descrip.mms
index cff613c8..fe275bb2 100644
--- a/WWW/Library/vms/descrip.mms
+++ b/WWW/Library/vms/descrip.mms
@@ -18,6 +18,7 @@
 !  03 May 95 (FM)	Include /NoMember for DECC (not the default on AXP,
 !			and the code assumes byte alignment).
 !  07 Jul 95 (FM)	Added GNUC support.
+!  15 Sep 06 (TD)	Cleanup...
 !
 ! Bugs:
 !	The dependencies are anything but complete - they were
@@ -81,84 +82,41 @@ INCLUDES = /Include=([-.Implementation],[---.src],[---])
 ! defines valid for all compilations
 EXTRADEFINES = ACCESS_AUTH, VC="""$(VC)"""
 
-! DECC flags for all compilations
-.ifdef DEC_C
-DCFLAGS = /NoMember /Warning=(disable=implicitfunc)  $(INCLUDES)
-.endif
-
-.ifdef UCX
-TCP = UCX
-.ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), UCX)
-.else
-CFLAGS = $(DEBUGFLAGS) /Define=($(EXTRADEFINES), UCX) $(INCLUDES)
-.endif
-.endif
-
-.ifdef TCPWARE
-TCP = TCPWARE
-.ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), UCX, TCPWARE)
-.else
-CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), UCX, TCPWARE) $(INCLUDES)
-.endif
-.endif
-
-.ifdef MULTINET
-TCP = MULTINET
-.ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
-.else
-CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), MULTINET) $(INCLUDES)
-.endif
-.endif
-
 .ifdef WIN_TCP
-TCP = WIN_TCP
-.ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), WIN_TCP)
+NETWORK_DEF = WIN_TCP
 .else
-CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), WIN_TCP) $(INCLUDES)
-.endif
-.endif
-
 .ifdef CMU_TCP
-TCP = CMU_TCP
-.ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), CMU_TCP)
+NETWORK_DEF = CMU_TCP
 .else
-CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), CMU_TCP) $(INCLUDES)
-.endif
-.endif
-
 .ifdef SOCKETSHR_TCP
-TCP = SOCKETSHR_TCP
-.ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), _DECC_V4_SOURCE, SOCKETSHR_TCP)
+NETWORK_DEF = SOCKETSHR_TCP
 .else
-CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), SOCKETSHR_TCP) $(INCLUDES)
-.endif
-.endif
-
-.ifdef DECNET
-TCP = DECNET
-.ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=($(EXTRADEFINES), DECNET)
+.ifdef UCX
+NETWORK_DEF = UCX
 .else
-CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), DECNET) $(INCLUDES)
-.endif
-.endif
-
-.ifdef TCP
+.ifdef TCPWARE
+NETWORK_DEF = TCPWARE,UCX
 .else
-TCP = MULTINET			! (Default to MULTINET)
+.ifdef DECnet
+NETWORK_DEF = DECNET
+.else !  Default to MultiNet
+NETWORK_DEF = MULTINET
+.endif !  DECnet
+.endif !  TCPWARE
+.endif !  UCX
+.endif !  SOCKETSHR_TCP
+.endif !  CMU_TCP
+.endif !  WIN_TCP
+
+! DECC flags for all compilations
 .ifdef DEC_C
-CFLAGS = /decc/Prefix=All $(DEBUGFLAGS) $(DCFLAGS) /Define=(_DECC_V4_SOURCE, __SOCKET_TYPEDEFS, $(EXTRADEFINES), MULTINET)
+MY_CFLAGS = /decc/Prefix=All /NoMember /Warning=(disable=implicitfunc) $(INCLUDES)
 .else
-CFLAGS = $(DEBUGFLAGS) /Define = ($(EXTRADEFINES), MULTINET) $(INCLUDES)
-.endif
+MY_CFLAGS = $(INCLUDES)
 .endif
 
+CFLAGS = $(DEBUGFLAGS) $(MY_CFLAGS) /Define=($(EXTRADEFINES), $(NETWORK_DEF))
+
 .ifdef GNU_C
 CC = gcc
 .endif
@@ -196,12 +154,12 @@ MODULES = HTParse, HTAccess, HTTP, HTFile, HTBTree, HTFTP, HTTCP, HTString, -
 !___________________________________________________________________
 ! WWW Library
 
-!library : $(HEADERS)  wwwlib_$(TCP)($(MODULES))
-library : wwwlib_$(TCP)($(MODULES))
+!library : $(HEADERS)  wwwlib($(MODULES))
+library : wwwlib($(MODULES))
  	@ Continue
 
-build_$(TCP).com : descrip.mms
-	$(MMS) /NoAction /From_Sources /Output = Build_$(TCP).com /Macro = ($(TCP)=1)
+build_www.com : descrip.mms
+	$(MMS) /NoAction /From_Sources /Output = build_www.com /Macro = ($(NETWORK_DEF)=1)
 
 clean :
 	- Set Protection = (Owner:RWED) *.*;-1
diff --git a/configure b/configure
index b682655e..8d22ee1e 100755
--- a/configure
+++ b/configure
@@ -1228,7 +1228,7 @@ fi;
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6pre.3
+VERSION=2.8.6pre.4
 
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
diff --git a/configure.in b/configure.in
index 7b3606f8..c559a97a 100644
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.6pre.3)
+AC_REVISION(2.8.6pre.4)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -57,7 +57,7 @@ AC_ARG_WITH(system-type,
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.6pre.3
+VERSION=2.8.6pre.4
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
diff --git a/descrip.mms b/descrip.mms
index 21f2d69d..51614bda 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -23,6 +23,7 @@
 !	     avoid any confusion with official releases at UKans.
 !  07/29/95 (macrides@sci.wfeb.edu)
 !	     Added support for GNUC.
+!  15 Sep 06 (TD)	Cleanup...
 !
 ! Instructions:
 !	Use the correct command line for your TCP/IP implementation:
@@ -51,42 +52,49 @@
 !	$ MMS /Macro = (TCPWARE=1, GNU_C=1)	for GNUC - TCPWare TCP/IP
 !	$ MMS /Macro = (DECNET=1, GNU_C=1)	for GNUC - socket emulation over DECnet
 
-.ifdef MULTINET
-TCPM = MULTINET
+.ifdef DEC_C
+COMPILE_DEF = DEC_C
+.else
+.ifdef GNU_C
+COMPILE_DEF = GNU_C
+.else
+COMPILE_DEF = VAX_C
 .endif
-
-.ifdef WIN_TCP
-TCPM = WIN_TCP
 .endif
 
-.ifdef UCX
-TCPM = UCX
+.ifdef SLANG
+SCREEN_DEF = SLANG
+.else
+SCREEN_DEF = VMS_CURSES
 .endif
 
+.ifdef WIN_TCP
+NETWORK_DEF = WIN_TCP
+.else
 .ifdef CMU_TCP
-TCPM = CMU_TCP
-.endif
-
+NETWORK_DEF = CMU_TCP
+.else
 .ifdef SOCKETSHR_TCP
-TCPM = SOCKETSHR_TCP
-.endif
-
+NETWORK_DEF = SOCKETSHR_TCP
+.else
+.ifdef UCX
+NETWORK_DEF = UCX
+.else
 .ifdef TCPWARE
-TCPM = TCPWARE
-.endif
-
-.ifdef DECNET
-TCPM = DECNET
-.endif
-
-.ifdef TCPM
+NETWORK_DEF = TCPWARE
 .else
-TCPM = MULTINET	!Default to MultiNet
-.endif
+.ifdef DECnet
+NETWORK_DEF = DECNET
+.else !  Default to MultiNet
+NETWORK_DEF = MULTINET
+.endif !  DECnet
+.endif !  TCPWARE
+.endif !  UCX
+.endif !  SOCKETSHR_TCP
+.endif !  CMU_TCP
+.endif !  WIN_TCP
 
-.ifdef GNU_C
-CC = gcc
-.endif
+RECURS_DEFS = /Macro=($(NETWORK_DEF)=1, $(SCREEN_DEF)=1, $(COMPILE_DEF)=1)
 
 lynx :	lynx.exe
 	! Finished Building LYNX for VMS!!!
@@ -96,30 +104,13 @@ lynx.exe : library exe
 
 library :
 	Set Default [.www.library.implementation]
-.ifdef DEC_C
-	$(MMS) $(MMSQUALIFIERS) /Description = [-.VMS]DESCRIP.MMS /Macro = ($(TCPM)=1, DEC_C=1) Library
-.else
-.ifdef GNU_C
-	$(MMS) $(MMSQUALIFIERS) /Description = [-.VMS]DESCRIP.MMS /Macro = ($(TCPM)=1, GNU_C=1) Library
-.else
-	$(MMS) $(MMSQUALIFIERS) /Description = [-.VMS]DESCRIP.MMS /Macro = ($(TCPM)=1) Library
-.endif
-.endif
+	$(MMS) $(MMSQUALIFIERS) /Description = [-.VMS]DESCRIP.MMS $(RECURS_DEFS) Library
 	Set Default [---]
 
 exe :
 	Set Default [.src]
-.ifdef DEC_C
-	$(MMS) $(MMSQUALIFIERS) /Macro = ($(TCPM)=1, DEC_C=1) Lynx
-.else
-.ifdef GNU_C
-	$(MMS) $(MMSQUALIFIERS) /Macro = ($(TCPM)=1, GNU_C=1) Lynx
-.else
-	$(MMS) $(MMSQUALIFIERS) /Macro = ($(TCPM)=1) Lynx
-.endif
-.endif
-	Copy /NoLog /NoConfirm lynx.exe [-]
-	Set Protection = (Owner:RWE, World:RE) [-]lynx.exe
+	$(MMS) $(MMSQUALIFIERS) $(RECURS_DEFS) Lynx
+	Copy /NoLog /NoConfirm lynx.exe [-];
 	Set Default [-]
 
 clean :
diff --git a/lynx.cfg b/lynx.cfg
index ba08e986..b59a4e45 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.6pre.3"
+#PRCS LYNX_VERSION "2.8.6pre.4"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sun, 10 Sep 2006 16:38:39 -0700"
+#PRCS LYNX_DATE "Mon, 18 Sep 2006 17:28:28 -0700"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
@@ -2970,13 +2970,13 @@ COLOR:6:brightred:black
 
 .h2 ASSUMED_COLOR
 # If built with a library that recognizes default colors (usually ncurses or
-# slang), lynx initializes it to assume the corresponding foreground and
-# background colors.  Default colors are those that the terminal (emulator)
-# itself is initialized to.  For instance, you might have an xterm running with
-# black text on a white background, and want lynx to display colored text on
-# the white background, but leave the possibility of using the same
-# configuration to draw colored text on a different xterm, this time using its
-# background set to black.
+# slang), and if the corresponding option is compiled into lynx, lynx
+# initializes it to assume the corresponding foreground and background colors. 
+# Default colors are those that the terminal (emulator) itself is initialized
+# to.  For instance, you might have an xterm running with black text on a white
+# background, and want lynx to display colored text on the white background,
+# but leave the possibility of using the same configuration to draw colored
+# text on a different xterm, this time using its background set to black.
 #
 # If built with conventional SVr3/SVr4 curses, tells lynx to use color pair 0
 # when the given colors match this setting.  That gives a similar effect,
@@ -2990,6 +2990,20 @@ COLOR:6:brightred:black
 # The first value given is the foreground, the second is the background.
 #ASSUMED_COLOR:default:default
 
+.h2 DEFAULT_COLORS
+# If built with a library that recognizes default colors (usually ncurses or
+# slang), and if the corresponding option is compiled into lynx, lynx
+# initializes it to assume the corresponding foreground and background colors. 
+# Default colors are those that the terminal (emulator) itself is initialized
+# to.
+#
+# Use this feature to disable the default-colors feature at runtime.
+# This is useful for constructing scripts which use the non-color-style
+# scheme, e.g., the oldlynx script.
+#
+# This should precede ASSUMED_COLOR settings.
+#DEFAULT_COLORS:true
+
 
 .h1 External Programs
 
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 95e57245..ff8555ea 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1706,7 +1706,7 @@ to keep track of information across a series of related form submissions,
 but have the potential for including information about the user that might
 be considered to represent an invasion of privacy.  NOTE, in this regard,
 that Lynx has implemented the <a
-href="http://www.w3.org/MarkUp/html3/Contents.html">HTML 3.0</a>
+href="http://www.w3.org/Markup/html3/">HTML 3.0</a>
 <em>DISABLED</em> attribute for <em>all</em> of its form fields.  These
 can be used to keep track of information across submissions, and to cast
 it unmodifiable in the current form, but keep the user aware that it will
diff --git a/po/da.po b/po/da.po
index 868dc9ef..7e247b23 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,14 +1,14 @@
 # Danish translation of the Lynx browser message catalog
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Morten Bo Johansen <mojo@mbjnet.dk>, 2000-2004
+# Morten Bo Johansen <mbj@spamcop.net>, 2000-2006
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.6-dev8\n"
+"Project-Id-Version: lynx 2.8.6-dev19\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-31 18:50-0400\n"
-"PO-Revision-Date: 2004-11-12 17:30+0100\n"
+"PO-Revision-Date: 2006-09-17 14:07+0200\n"
 "Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -235,7 +235,7 @@ msgstr "SKRIVEBESKYTTET adgangskodeformular. Pil OP/NED el. TAB forlader felt."
 #. #define FORM_LINK_CHECKBOX_MESSAGE
 #: LYMessages.c:104
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
-msgstr "(Afkrydsningsfelt)   Højrepil el. <retur> slår til/fra."
+msgstr "(Afkrydsningsfelt) Højrepil eller <retur> (de)aktiverer."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
 #: LYMessages.c:106
@@ -593,7 +593,7 @@ msgstr "'d'ownload-kommandoen er deaktiveret i øjeblikket."
 
 #: LYMessages.c:233
 msgid "You cannot download an input field."
-msgstr "Kan ikke hente et inddatafelt."
+msgstr "Kan ikke hente et indtastningsfelt."
 
 #: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
@@ -820,7 +820,7 @@ msgstr "Gem L)ink i bogmærkefil eller A)fbryd? (l,a): "
 #. #define NOBOOK_POST_FORM
 #: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
-msgstr "Formulardokumenter med 'POST'-indhold kan ikke gemmes som bogmærker."
+msgstr "Formulardokumenter med POST-indhold kan ikke gemmes som bogmærker."
 
 #: LYMessages.c:307
 msgid "Cannot save form fields/links"
@@ -2553,9 +2553,9 @@ msgid "Retrying with proxy authorization information."
 msgstr "Prøver igen med godkendelsesinformation fra proxyvært."
 
 #: LYMessages.c:796
-#, fuzzy, c-format
+#, c-format
 msgid "SSL error:%s-Continue?"
-msgstr "SSL-fejl:vært(%s)!=cert(%s) - fortsæt?"
+msgstr "SSL-fejl:%s - fortsæt?"
 
 #. HTWAIS.c
 #: LYMessages.c:799
@@ -2848,7 +2848,8 @@ msgstr "sokkel til primær sokkel"
 #. * 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:1697 WWW/Library/Implementation/HTFTP.c:2314
+#: WWW/Library/Implementation/HTFTP.c:1697
+#: WWW/Library/Implementation/HTFTP.c:2314
 msgid "Symbolic Link"
 msgstr "Symbolsk link"
 
@@ -3023,7 +3024,8 @@ msgstr "Adresse har en ugyldig port"
 msgid "Address length looks invalid"
 msgstr "Adresselængde forekommer ugyldig"
 
-#: WWW/Library/Implementation/HTTCP.c:1581 WWW/Library/Implementation/HTTCP.c:1599
+#: WWW/Library/Implementation/HTTCP.c:1581
+#: WWW/Library/Implementation/HTTCP.c:1599
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ude af stand til at finde fremmed vært %s."
@@ -3032,7 +3034,8 @@ msgstr "Ude af stand til at finde fremmed vært %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1596 WWW/Library/Implementation/HTTelnet.c:108
+#: WWW/Library/Implementation/HTTCP.c:1596
+#: WWW/Library/Implementation/HTTelnet.c:108
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ugyldigt værtsnavn %s"
@@ -3086,34 +3089,33 @@ msgstr "Forsøger at genetablere forbindelsen uden TLS."
 
 #: WWW/Library/Implementation/HTTP.c:664
 msgid "no issuer was found"
-msgstr ""
+msgstr "ingen udsteder fundet"
 
+# CA = Certification Authority
 #: WWW/Library/Implementation/HTTP.c:666
 msgid "issuer is not a CA"
-msgstr ""
+msgstr "udsteder er ikke en certificeringsmyndighed"
 
 #: WWW/Library/Implementation/HTTP.c:668
 msgid "the certificate has no known issuer"
-msgstr ""
+msgstr "certifikatet har ingen kendt udsteder"
 
 #: WWW/Library/Implementation/HTTP.c:670
-#, fuzzy
 msgid "the certificate has been revoked"
-msgstr "Cookier er blevet slettet!"
+msgstr "certifikatet er blevet tilbagekaldt"
 
 #: WWW/Library/Implementation/HTTP.c:672
 msgid "the certificate is not trusted"
-msgstr ""
+msgstr "certifikatet er ikke troværdigt"
 
 #: WWW/Library/Implementation/HTTP.c:747
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
-msgstr ""
+msgstr "Verificerede forbindelse til %s (cert=%s)"
 
 #: WWW/Library/Implementation/HTTP.c:771
-#, fuzzy
 msgid "Can't find common name in certificate"
-msgstr "SSL-fejl: Kan ikke finde fælles navn i certifikat - fortsæt?"
+msgstr "Kan ikke finde fælles navn i certifikat"
 
 #: WWW/Library/Implementation/HTTP.c:774
 #, c-format
@@ -3663,7 +3665,7 @@ msgstr "Fil kan måske genskabes fra %s under denne session"
 #: src/LYCgi.c:159
 #, c-format
 msgid "Do you want to execute \"%s\"?"
-msgstr ""
+msgstr "Vil du udføre \"%s\"?"
 
 #.
 #. * Neither the path as given nor any components examined by backing up
@@ -4241,7 +4243,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Opsætningsfil %s er ikke tilgængelig.\n"
+"Opsætningsfil \"%s\" er ikke tilgængelig.\n"
 "\n"
 
 #: src/LYMain.c:1466
@@ -4274,7 +4276,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Lynx-fil %s er ikke tilgængelig.\n"
+"Lynx-fil \"%s\" er ikke tilgængelig.\n"
 "\n"
 
 #: src/LYMain.c:1762
@@ -4505,7 +4507,8 @@ msgid "ON"
 msgstr "SLÅET TIL"
 
 #. verbose_img variable
-#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280 src/LYOptions.c:2291
+#: src/LYOptions.c:2127 src/LYOptions.c:2132 src/LYOptions.c:2280
+#: src/LYOptions.c:2291
 msgid "OFF"
 msgstr "SLÅET FRA"
 
@@ -4913,9 +4916,8 @@ msgstr "Personlig e-post-adresse"
 
 #. Mail Address: INPUT
 #: src/LYOptions.c:3720
-#, fuzzy
 msgid "Password for anonymous ftp"
-msgstr "Adgangskode for nyhedsvært (news) '%s':"
+msgstr "Adgangskode til anonymous ftp"
 
 # media type refererer til content-type headeren, eks: image/xyz
 #. Preferred media type: SELECT
@@ -5285,9 +5287,8 @@ msgid "Content-Length:"
 msgstr "'Content-Length':"
 
 #: src/LYShowInfo.c:360
-#, fuzzy
 msgid "Length:"
-msgstr "'Content-Length':"
+msgstr "Længde:"
 
 #: src/LYShowInfo.c:365
 msgid "Language:"
@@ -5295,11 +5296,11 @@ msgstr "Sprog:"
 
 #: src/LYShowInfo.c:372
 msgid "Post Data:"
-msgstr "'Post Data:'"
+msgstr "POST-data:"
 
 #: src/LYShowInfo.c:375
 msgid "Post Content Type:"
-msgstr "'Post Content Type:'"
+msgstr "POST-indholdstype:"
 
 #: src/LYShowInfo.c:378
 msgid "Owner(s):"
@@ -5359,7 +5360,7 @@ msgstr "Metode:"
 
 #: src/LYShowInfo.c:428
 msgid "Enctype:"
-msgstr "Kodtype:"
+msgstr "Kod.type:"
 
 #: src/LYShowInfo.c:434
 msgid "Action:"
@@ -5436,7 +5437,7 @@ msgstr "Uventet adgangsprotokol for denne adressetype."
 
 #: src/LYUtils.c:3384
 msgid "Too many tempfiles"
-msgstr "For mange tempfiler"
+msgstr "For mange midlertidige filer"
 
 #: src/LYUtils.c:3688
 msgid "unknown restriction"
@@ -5479,6 +5480,10 @@ msgid ""
 "Lynx will use the personal email address.  Set anonftp_password\n"
 "to a different value if you choose.\n"
 msgstr ""
+"anonftp_password lader brugeren instruere Lynx om at bruge den personlige\n"
+"e-post-adresse som adgangskode ved anonymous ftp. Hvis der ikke er angivet\n"
+"en værdi, vil Lynx bruge den personlige e-post-adresse. Sæt anonftp_password\n"
+"til en anden værdi hvis du ønsker det.\n"
 
 #: src/LYrcFile.c:331
 msgid ""
@@ -5547,9 +5552,9 @@ msgid ""
 msgstr ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, og\n"
 "cookie_query_invalid_domains er en kommasepareret liste over hvilke\n"
-"domæner der skal underkastes varierende grader af gyldighedstjek. hvis\n"
-"et domæne er sat til strengt tjek, vil en streng overholdelse af RFC2109\n"
-"blive krævet. Et domæne med et afslappet tjek vil blive tilladt at sende\n"
+"domæner der skal underkastes varierende grader af gyldighedskontrol. hvis\n"
+"et domæne er sat til streng kontrol, vil en streng overholdelse af RFC2109\n"
+"blive krævet. Et domæne med et løs kontrol vil blive tilladt at sende\n"
 "cookier med en ugyldig sti eller domæneattribut. Alle domæner vil som\n"
 "standard spørge brugeren om en ugyldig sti eller domæne.\n"
 
diff --git a/samples/blue-background.lss b/samples/blue-background.lss
index 7bc256b7..9c5d4925 100644
--- a/samples/blue-background.lss
+++ b/samples/blue-background.lss
@@ -35,13 +35,11 @@ tt:		dim:			gray:		blue
 h1:		bold:			yellow:		blue 
 label:		normal:			magenta:	blue 
 value:		normal:			green:		blue 
-high:		bold:			brightmagenta:	blue 
 q:		normal:			yellow:		magenta 
 small:		dim:			gray:		blue 
 big:		bold:			yellow:		blue 
 sup:		bold:			yellow:		blue 
 sub:		dim:			gray:		blue 
-lh:		bold:			yellow:		magenta 
  
 # glitch fixes 
 area:		normal:			lightgray:	blue 
diff --git a/samples/lynx.lss b/samples/lynx.lss
index 9349de72..2d02eb18 100644
--- a/samples/lynx.lss
+++ b/samples/lynx.lss
@@ -33,7 +33,6 @@ small:		dim:			default
 big:		bold:			yellow
 sup:		bold:			yellow
 sub:		dim:			gray
-lh:		bold:			yellow:		magenta
 li:		normal:			magenta
 code:		normal:			cyan
 cite:		normal:			cyan
@@ -57,7 +56,6 @@ alert:		bold:			yellow:		red
 whereis:	reverse+underline:	magenta:	cyan
 # currently not used
 #value:normal:green
-#high:bold:brightmagenta
 
 menu.bg:	normal:			black:		lightgray
 menu.frame:	normal:			black:		lightgray
diff --git a/samples/mild-colors.lss b/samples/mild-colors.lss
index 8f352ce5..2807e501 100644
--- a/samples/mild-colors.lss
+++ b/samples/mild-colors.lss
@@ -36,13 +36,11 @@ tt:		normal:			white:		black
 h1:		bold:			cyan:		black
 label:		normal:			cyan
 value:		normal:			cyan
-high:		bold:			cyan
 q:		normal:			cyan
 small:		dim:			cyan
 big:		bold:			cyan
 sup:		bold:			cyan
 sub:		dim:			cyan
-lh:		bold:			cyan
 code:		normal:			cyan
 
 span.htmlsrc_comment:normal:white
diff --git a/samples/oldlynx b/samples/oldlynx
new file mode 100755
index 00000000..11fde3b0
--- /dev/null
+++ b/samples/oldlynx
@@ -0,0 +1,20 @@
+#!/bin/sh
+# invoke lynx built with color-style, overriding the color options to use the
+# non-color-style scheme -TD
+
+my_cfg=${TMPDIR:-/tmp}/lynxcfg$$
+trap "rm -f $my_cfg" 0 1 2 5 15
+
+rm -f "$my_cfg"
+echo "DEFAULT_COLORS:off" >>$my_cfg
+if test -n "$LYNX_CFG" ; then
+	echo "include:$LYNX_CFG" >>$my_cfg
+fi
+echo "COLOR_STYLE:" >>$my_cfg
+echo "NESTED_TABLES:off" >>$my_cfg
+
+LYNX_CFG=$my_cfg
+export LYNX_CFG
+unset LYNX_LSS
+
+${LYNX_PROG-lynx} "$@"
diff --git a/src/AttrList.h b/src/AttrList.h
index b73babc7..5d4015d6 100644
--- a/src/AttrList.h
+++ b/src/AttrList.h
@@ -23,7 +23,6 @@ extern "C" {
 	DSTYLE_NORMAL,		/* default attributes */
 	DSTYLE_OPTION,		/* option on the option screen */
 	DSTYLE_VALUE,		/* value on the option screen */
-	DSTYLE_HIGH,
 	DSTYLE_CANDY,		/* possibly going to vanish */
 	DSTYLE_WHEREIS,		/* whereis search target */
 	DSTYLE_ELEMENTS
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 7f1c371a..dd7ef979 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -548,34 +548,9 @@ void curses_style(int style,
 
 static BOOL lynx_called_initscr = FALSE;
 
-#if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS)
-/*
- * If we find a "default" color while reading the config-file, set default
- * colors on the screen.
- */
-int lynx_default_colors(void)
-{
-    int code = 0;
-
-    if (!default_color_reset) {
-	if (lynx_called_initscr) {
-	    code = -1;
-	    if (use_default_colors() == OK) {
-		default_fg = DEFAULT_COLOR;
-		default_bg = DEFAULT_COLOR;
-		code = 1;
-	    } else {
-		default_fg = COLOR_WHITE;
-		default_bg = COLOR_BLACK;
-		default_color_reset = TRUE;
-	    }
-	}
-    }
-    return code;
-}
-#endif /* HAVE_USE_DEFAULT_COLORS && USE_DEFAULT_COLORS */
-
 #if defined(USE_COLOR_TABLE) && defined(COLOR_CURSES)
+#define COLOR_CFG_MAX 8
+
 /*
  * This block of code is designed to produce the same color effects using SVr4
  * curses as the slang library's implementation in this module.  That maps the
@@ -585,27 +560,30 @@ int lynx_default_colors(void)
  * 1997/1/19 - T.E.Dickey <dickey@clark.net>
  */
 /* *INDENT-OFF* */
+#define COLOR_CFG(c) c, (c) == DEFAULT_COLOR
 static struct {
-    int fg, bg;
+    int fg, dft_fg, bg, dft_bg;
 } lynx_color_cfg[] = {
-    /*0*/ { DEFAULT_FG,    DEFAULT_BG},
-    /*1*/ { COLOR_BLUE,    DEFAULT_BG},
-    /*2*/ { COLOR_YELLOW+8,COLOR_BLUE},
-    /*3*/ { COLOR_GREEN,   DEFAULT_BG},
-    /*4*/ { COLOR_MAGENTA, DEFAULT_BG},
-    /*5*/ { COLOR_BLUE,    DEFAULT_BG},
-    /*6*/ { COLOR_RED,	   DEFAULT_BG},
-    /*7*/ { COLOR_MAGENTA, COLOR_CYAN}
+    /*0*/ { COLOR_CFG(DEFAULT_FG),     COLOR_CFG(DEFAULT_BG)},
+    /*1*/ { COLOR_CFG(COLOR_BLUE),     COLOR_CFG(DEFAULT_BG)},
+    /*2*/ { COLOR_CFG(COLOR_YELLOW+8), COLOR_CFG(COLOR_BLUE)},
+    /*3*/ { COLOR_CFG(COLOR_GREEN),    COLOR_CFG(DEFAULT_BG)},
+    /*4*/ { COLOR_CFG(COLOR_MAGENTA),  COLOR_CFG(DEFAULT_BG)},
+    /*5*/ { COLOR_CFG(COLOR_BLUE),     COLOR_CFG(DEFAULT_BG)},
+    /*6*/ { COLOR_CFG(COLOR_RED),      COLOR_CFG(DEFAULT_BG)},
+    /*7*/ { COLOR_CFG(COLOR_MAGENTA),  COLOR_CFG(COLOR_CYAN)}
 };
 /* *INDENT-ON* */
 
+#define COLOR_PAIRS_MAX (COLOR_CFG_MAX * 3 + 1)
+
 /*
  * Hold the codes for color-pairs here until 'initscr()' is called.
  */
 static struct {
     int fg;
     int bg;
-} lynx_color_pairs[25];
+} lynx_color_pairs[COLOR_PAIRS_MAX];
 
 /*
  * If we find an exact match for the given default colors, force curses to use
@@ -642,7 +620,7 @@ static int lynx_color_cfg_attr(int code)
 {
     int result = A_NORMAL;
 
-    if (code >= 0 && code < 8) {
+    if (code >= 0 && code < COLOR_CFG_MAX) {
 	int fg = lynx_color_cfg[code].fg;
 
 	if (is_boldc(fg) && (fg & COLORS))
@@ -722,7 +700,8 @@ char *LYgetTableString(int code)
     if (fg == 0 && bg == 0) {
 	fg = COLOR_WHITE;
     }
-    CTRACE((tfp, "%#x -> %#x (mono %#x pair %d) fg=%d, bg=%d\n", mask, second, mono, pair, fg, bg));
+    CTRACE((tfp, "%#x -> %#x (mono %#x pair %d) fg=%d, bg=%d\n",
+	    mask, second, mono, pair, fg, bg));
     for (n = 0; n < TABLESIZE(Mono_Attrs); ++n) {
 	if ((Mono_Attrs[n].code & mono) != 0) {
 	    if (result != 0)
@@ -771,17 +750,18 @@ static void lynx_init_color_pair(int n)
 
 static void lynx_map_color(int n)
 {
+    int j;
+
     CTRACE((tfp, "lynx_map_color(%d)\n", n));
 
     if (n + 1 < (int) TABLESIZE(lynx_color_pairs)) {
-	lynx_color_pairs[n + 1].fg = lynx_color_cfg[n].fg;
-	lynx_color_pairs[n + 1].bg = lynx_color_cfg[n].bg;
-
-	lynx_color_pairs[n + 9].fg = lynx_color_cfg[n].fg;
-	lynx_color_pairs[n + 9].bg = lynx_color_cfg[0].bg;
+	for (j = n + 1; j < COLOR_PAIRS_MAX; j += COLOR_CFG_MAX) {
+	    lynx_color_pairs[j].fg = lynx_color_cfg[n].fg;
+	    lynx_color_pairs[j].bg = lynx_color_cfg[n].bg;
+	}
 
-	lynx_color_pairs[n + 17].fg = lynx_color_cfg[n].bg;
-	lynx_color_pairs[n + 17].bg = lynx_color_cfg[n].bg;
+	/* special case (does not apply to 3rd set) */
+	lynx_color_pairs[n + 1 + COLOR_CFG_MAX].bg = lynx_color_cfg[0].bg;
     }
 
     lynx_init_color_pair(n);
@@ -799,7 +779,7 @@ int lynx_chg_color(int color,
 
     if (fg == ERR_COLOR || bg == ERR_COLOR)
 	return -1;
-    if (color >= 0 && color < 8) {
+    if (color >= 0 && color < COLOR_CFG_MAX) {
 	lynx_color_cfg[color].fg = fg;
 	lynx_color_cfg[color].bg = bg;
 	lynx_map_color(color);
@@ -851,7 +831,17 @@ void lynx_setup_colors(void)
     int n;
 
     CTRACE((tfp, "lynx_setup_colors\n"));
-    for (n = 0; n < 8; n++)
+#ifdef USE_DEFAULT_COLORS
+    if (!LYuse_default_colors) {
+	for (n = 0; n < COLOR_CFG_MAX; n++) {
+	    if (lynx_color_cfg[n].dft_fg)
+		lynx_color_cfg[n].fg = COLOR_BLACK;
+	    if (lynx_color_cfg[n].dft_bg)
+		lynx_color_cfg[n].bg = COLOR_WHITE;
+	}
+    }
+#endif
+    for (n = 0; n < COLOR_CFG_MAX; n++)
 	lynx_map_color(n);
 }
 #endif /* USE_COLOR_TABLE */
@@ -1171,36 +1161,49 @@ void start_curses(void)
 #endif
 
 #ifdef USE_DEFAULT_COLORS
+	    if (LYuse_default_colors) {
 #if defined(EXP_ASSUMED_COLOR) && defined(USE_COLOR_TABLE)
-	    /*
-	     * Adjust the color mapping table to match the ASSUMED_COLOR
-	     * setting in lynx.cfg
-	     */
-	    if (assume_default_colors(default_fg, default_bg) != OK) {
-		default_fg = COLOR_WHITE;
-		default_bg = COLOR_BLACK;
-	    }
-	    CTRACE((tfp, "initializing default colors %d/%d\n",
-		    default_fg, default_bg));
-	    if (default_fg >= 0 || default_bg >= 0) {
-		unsigned n;
-
-		for (n = 0; n < TABLESIZE(lynx_color_cfg); n++) {
-		    if (default_fg >= 0 && lynx_color_cfg[n].fg < 0)
-			lynx_color_cfg[n].fg = default_fg;
-		    if (default_bg >= 0 && lynx_color_cfg[n].bg < 0)
-			lynx_color_cfg[n].bg = default_bg;
-		    CTRACE((tfp, "color_cfg[%u] = %d/%d\n", n,
-			    lynx_color_cfg[n].fg,
-			    lynx_color_cfg[n].bg));
+		/*
+		 * Adjust the color mapping table to match the ASSUMED_COLOR
+		 * setting in lynx.cfg
+		 */
+		if (assume_default_colors(default_fg, default_bg) != OK) {
+		    default_fg = COLOR_WHITE;
+		    default_bg = COLOR_BLACK;
+		}
+		CTRACE((tfp, "initializing default colors %d/%d\n",
+			default_fg, default_bg));
+		if (default_fg >= 0 || default_bg >= 0) {
+		    unsigned n;
+
+		    for (n = 0; n < TABLESIZE(lynx_color_cfg); n++) {
+			if (default_fg >= 0 && lynx_color_cfg[n].fg < 0)
+			    lynx_color_cfg[n].fg = default_fg;
+			if (default_bg >= 0 && lynx_color_cfg[n].bg < 0)
+			    lynx_color_cfg[n].bg = default_bg;
+			CTRACE((tfp, "color_cfg[%u] = %d/%d\n", n,
+				lynx_color_cfg[n].fg,
+				lynx_color_cfg[n].bg));
+		    }
+		    lynx_setup_colors();
 		}
-		lynx_setup_colors();
-	    }
 #else
 #if defined(HAVE_USE_DEFAULT_COLORS)
-	    lynx_default_colors();
+		if (!default_color_reset) {
+		    if (lynx_called_initscr) {
+			if (LYuse_default_colors && (use_default_colors() == OK)) {
+			    default_fg = DEFAULT_COLOR;
+			    default_bg = DEFAULT_COLOR;
+			} else {
+			    default_fg = COLOR_WHITE;
+			    default_bg = COLOR_BLACK;
+			    default_color_reset = TRUE;
+			}
+		    }
+		}
 #endif /* HAVE_USE_DEFAULT_COLORS */
 #endif /* EXP_ASSUMED_COLOR */
+	    }
 #endif /* USE_DEFAULT_COLORS */
 	}
 #endif /* USE_COLOR_STYLE || USE_COLOR_TABLE */
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index b1e19f66..a3ec2edf 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -577,6 +577,10 @@ extern "C" {
     extern char *lynx_lss_file;
 #endif
 
+#ifdef USE_DEFAULT_COLORS
+    extern BOOLEAN LYuse_default_colors;
+#endif
+
     extern int HTNoDataOK;	/* HT_NO_DATA-is-ok hack */
     extern BOOLEAN FileInitAlreadyDone;
 
diff --git a/src/LYMain.c b/src/LYMain.c
index 00c387e6..1f7699de 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -633,6 +633,10 @@ char *lynx_lss_file2 = NULL;	/* from command-line options */
 char *lynx_lss_file = NULL;	/* from config-file, etc. */
 #endif
 
+#ifdef USE_DEFAULT_COLORS
+BOOLEAN LYuse_default_colors = TRUE;
+#endif
+
 #ifdef __DJGPP__
 static void LY_set_ctrl_break(int setting)
 {
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 89fb9390..b34041e0 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -297,7 +297,7 @@ int check_color(char *color,
     CTRACE2(TRACE_STYLE, (tfp, "check_color(%s,%d)\n", color, the_default));
     if (!strcasecomp(color, "default")) {
 #ifdef USE_DEFAULT_COLORS
-	if (!default_color_reset)
+	if (LYuse_default_colors && !default_color_reset)
 	    the_default = DEFAULT_COLOR;
 #endif /* USE_DEFAULT_COLORS */
 	CTRACE2(TRACE_STYLE, (tfp, "=> default %d\n", the_default));
@@ -510,32 +510,37 @@ static int assumed_color_fun(char *buffer)
     char *fg = buffer, *bg;
     char *temp = 0;
 
-    StrAllocCopy(temp, buffer);	/* save a copy, for error messages */
+    if (LYuse_default_colors) {
+	StrAllocCopy(temp, buffer);	/* save a copy, for error messages */
 
-    /*
-     * We are expecting a line of the form:
-     *    FOREGROUND:BACKGROUND
-     */
-    if (NULL == (bg = find_colon(fg)))
-	exit_with_color_syntax(temp);
-    *bg++ = '\0';
+	/*
+	 * We are expecting a line of the form:
+	 *    FOREGROUND:BACKGROUND
+	 */
+	if (NULL == (bg = find_colon(fg)))
+	    exit_with_color_syntax(temp);
+	*bg++ = '\0';
 
-    default_fg = check_color(fg, default_fg);
-    default_bg = check_color(bg, default_bg);
+	default_fg = check_color(fg, default_fg);
+	default_bg = check_color(bg, default_bg);
 
-    if (default_fg == ERR_COLOR
-	|| default_bg == ERR_COLOR)
-	exit_with_color_syntax(temp);
+	if (default_fg == ERR_COLOR
+	    || default_bg == ERR_COLOR)
+	    exit_with_color_syntax(temp);
 #ifdef USE_SLANG
-    /*
-     * Sorry - the order of initialization of slang precludes setting the
-     * default colors from the lynx.cfg file, since slang is already
-     * initialized before the file is read, and there is no interface defined
-     * for setting it from the application (that's one of the problems with
-     * using environment variables rather than a programmable interface) -TD
-     */
+	/*
+	 * Sorry - the order of initialization of slang precludes setting the
+	 * default colors from the lynx.cfg file, since slang is already
+	 * initialized before the file is read, and there is no interface
+	 * defined for setting it from the application (that's one of the
+	 * problems with using environment variables rather than a programmable
+	 * interface) -TD
+	 */
 #endif
-    FREE(temp);
+	FREE(temp);
+    } else {
+	CTRACE((tfp, "...ignored since DEFAULT_COLORS:off\n"));
+    }
     return 0;
 }
 #endif /* EXP_ASSUMED_COLOR */
@@ -548,6 +553,26 @@ static int color_fun(char *value)
 }
 #endif
 
+#ifdef USE_DEFAULT_COLORS
+static int default_colors_fun(char *value)
+{
+    LYuse_default_colors = is_true(value);
+    if (LYuse_default_colors) {
+	default_fg = DEFAULT_COLOR;
+	default_bg = DEFAULT_COLOR;
+    } else {
+	default_color_reset = TRUE;
+	if (default_fg == DEFAULT_COLOR ||
+	    default_bg == DEFAULT_COLOR) {
+	    default_fg = COLOR_WHITE;
+	    default_bg = COLOR_BLACK;
+	    lynx_setup_colors();
+	}
+    }
+    return 0;
+}
+#endif
+
 static int default_bookmark_file_fun(char *value)
 {
     set_default_bookmark_page(value);
@@ -1282,6 +1307,9 @@ static Config_Type Config_Table [] =
      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),
+#ifdef USE_DEFAULT_COLORS
+     PARSE_FUN(RC_DEFAULT_COLORS,       default_colors_fun),
+#endif
      PARSE_FUN(RC_DEFAULT_EDITOR,       default_editor_fun),
      PARSE_STR(RC_DEFAULT_INDEX_FILE,   indexfile),
      PARSE_ENU(RC_DEFAULT_KEYPAD_MODE,  keypad_mode, tbl_keypad_mode),
diff --git a/src/LYReadCFG.h b/src/LYReadCFG.h
index bbdcf5c3..cd02a107 100644
--- a/src/LYReadCFG.h
+++ b/src/LYReadCFG.h
@@ -41,10 +41,6 @@ extern "C" {
     extern int default_bg;
     extern BOOL default_color_reset;
 
-#if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS)
-    extern int lynx_default_colors(void);
-#endif
-
     extern int check_color(char *color, int the_default);
     extern const char *lookup_color(int code);
 #endif
diff --git a/src/LYStyle.c b/src/LYStyle.c
index a8ac9379..838146e4 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.61 Thu, 31 Aug 2006 16:37:53 -0700 dickey @
+ * @Id: LYStyle.c 1.62 Mon, 18 Sep 2006 17:28:28 -0700 dickey @
  */
 #include <HTUtils.h>
 #include <HTML.h>
@@ -251,7 +251,6 @@ static void parse_style(char *param)
 	{ "status",		DSTYLE_STATUS,		0 }, /* status bar */
 	{ "label",		DSTYLE_OPTION,		0 }, /* [INLINE]'s */
 	{ "value",		DSTYLE_VALUE,		0 }, /* [INLINE]'s */
-	{ "high",		DSTYLE_HIGH,		0 }, /* [INLINE]'s */
 	{ "normal",		DSTYLE_NORMAL,		0 },
 	{ "candy",		DSTYLE_CANDY,		0 }, /* [INLINE]'s */
 	{ "whereis",		DSTYLE_WHEREIS,		&s_whereis },
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index 43e29631..5da0e1bb 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -49,6 +49,7 @@
 #define RC_CSWING_PATH                  "cswing_path"
 #define RC_DEFAULT_BOOKMARK_FILE        "default_bookmark_file"
 #define RC_DEFAULT_CACHE_SIZE           "default_cache_size"
+#define RC_DEFAULT_COLORS               "default_colors"
 #define RC_DEFAULT_EDITOR               "default_editor"
 #define RC_DEFAULT_INDEX_FILE           "default_index_file"
 #define RC_DEFAULT_KEYPAD_MODE          "default_keypad_mode"
diff --git a/src/descrip.mms b/src/descrip.mms
index 2f8def50..3fc03ff2 100644
--- a/src/descrip.mms
+++ b/src/descrip.mms
@@ -25,6 +25,7 @@
 !  07/29/95 FM Added support for GNUC.
 !  02/29/96 FM Added LYMap.
 !  06/28/97 FM Added UCAuto, UCAux, and UCdomap.
+!  15 Sep 06 (TD)	Cleanup...
 !
 ! Instructions:
 !       Use the correct command line for your TCP/IP implementation:
@@ -65,97 +66,88 @@ OBJS =	DefaultStyle.obj, GridText.obj, HTAlert.obj, HTFWriter.obj, -
 	LYUpload.obj, LYUtils.obj, LYexit.obj, LYrcFile.obj, TRSTable.obj, -
 	UCAuto.obj, UCAux.obj, UCdomap.obj
 
-.ifdef WIN_TCP
-TCP = WIN_TCP
-TCPOPT = WIN_TCP
+.ifdef SLANG
+SCREEN_DEF = USE_SLANG
+SCREEN_INC = , SLANG_INC 
+SCREEN_LIB = , SLANG_LIB:slang.olb/lib
+.else
 .ifdef DEC_C
-CDEF = __VMS_CURSES
+SCREEN_DEF = __VMS_CURSES
 .endif
 .endif
 
-.ifdef CMU_TCP
-TCP = CMU_TCP
-TCPOPT = CMU_TCP
 .ifdef DEC_C
-CDEF = __VMS_CURSES
+COMPILER = DECC
+MODEL_DEF = _DECC_V4_SOURCE
+.else
+MODEL_DEF =
+.ifdef GNU_C
+COMPILER = GNUC
+CC = gcc
+.else
+COMPILER = VAXC
 .endif
 .endif
 
+.ifdef WIN_TCP
+NETWORK_DEF = WIN_TCP
+NETWORK_OPT = WIN_TCP
+.else
+.ifdef CMU_TCP
+NETWORK_DEF = CMU_TCP
+NETWORK_OPT = CMU_TCP
+.else
 .ifdef SOCKETSHR_TCP
-TCP = SOCKETSHR_TCP
-TCPOPT = SOCKETSHR_TCP
-.ifdef DEC_C
-CDEF = _DECC_V4_SOURCE,__VMS_CURSES
-.endif
-.endif
-
+NETWORK_DEF = SOCKETSHR_TCP
+NETWORK_OPT = SOCKETSHR_TCP
+.else
 .ifdef UCX
-TCP = UCX
+NETWORK_DEF = UCX
 .ifdef DEC_C
-TCPOPT = UCXSHR
-CDEF = __VMS_CURSES
+NETWORK_OPT = UCXSHR
 .else
-TCPOPT = UCXOLB
-.endif
+NETWORK_OPT = UCXOLB
 .endif
-
+.else
 .ifdef TCPWARE
-TCP = TCPWARE
+NETWORK_DEF = TCPWARE,UCX
 .ifdef DEC_C
-TCTOPT= TCPWARESHR
-CDEF = __VMS_CURSES
+NETWORK_OPT = TCPWARESHR
 .else
-TCTOPT= TCPWAREOLB
-.endif
+NETWORK_OPT = TCPWAREOLB
 .endif
-
-.ifdef MULTINET
-TCP = MULTINET
-TCPOPT = MULTINET
-.ifdef DEC_C
-CDEF = _DECC_V4_SOURCE,__SOCKET_TYPEDEFS,__VMS_CURSES
-.endif
-.endif
-
-.ifdef DECnet
-TCP = DECNET
-TCPOPT = DECNET
-.endif
-
-.ifdef TCP
 .else
-TCP = MULTINET
-TCPOPT = MULTINET
-.ifdef DEC_C
-CDEF = _DECC_V4_SOURCE,__SOCKET_TYPEDEFS,__VMS_CURSES
-.endif
-.endif
+.ifdef DECnet
+NETWORK_DEF = DECNET
+NETWORK_OPT = DECNET
+.else !  Default to MultiNet
+NETWORK_DEF = MULTINET,__SOCKET_TYPEDEFS
+NETWORK_OPT = MULTINET
+.endif !  DECnet
+.endif !  TCPWARE
+.endif !  UCX
+.endif !  SOCKETSHR_TCP
+.endif !  CMU_TCP
+.endif !  WIN_TCP
+
+COMPILER_DEF = $(MODEL_DEF),$(NETWORK_DEF),$(SCREEN_DEF)
 
 .ifdef DEC_C
-COMPILER = DECC
-.ifdef TCPWARE
-TCPFLAGS = /decc/Prefix=All/NoMember/Define=(ACCESS_AUTH,$(TCP),UCX,$(CDEF))
+MY_CFLAGS = /decc/Prefix=All/NoMember/Define=(ACCESS_AUTH,$(COMPILER_DEF))
 .else
-TCPFLAGS = /decc/Prefix=All/NoMember/Define=(ACCESS_AUTH,$(TCP),$(CDEF))
+MY_CFLAGS = /Define = (ACCESS_AUTH, $(COMPILER_DEF))
 .endif
+
+.if "$(MMS_ARCHNAME)" .eq "IA64"
+TOPT = 
+COPT = 
 .else
-.ifdef GNU_C
-COMPILER = GNUC
-CC = gcc
-.else
-COMPILER = VAXC
-.endif
-.ifdef TCPWARE
-TCPFLAGS = /Define = (ACCESS_AUTH, $(TCP), UCX)
-.else
-TCPFLAGS = /Define = (ACCESS_AUTH, $(TCP))
-.endif
+TOPT = ,sys$disk:[]$(NETWORK_OPT).opt/opt
+COPT = ,sys$disk:[]$(COMPILER).opt/opt
 .endif
 
-TOPT = sys$disk:[]$(TCPOPT).opt
-COPT = sys$disk:[]$(COMPILER).opt
-WWWLIB = [-.WWW.Library.Implementation]WWWLib_$(TCP).olb
-CFLAGS = $(TCPFLAGS) $(CFLAGS)/Include=([], [-], [.chrtrans], [-.WWW.Library.Implementation])
+WWWLIB = [-.WWW.Library.Implementation]WWWLib.olb
+CFLAGS = $(MY_CFLAGS) $(CFLAGS)/Include=([], [-], [.chrtrans], [-.WWW.Library.Implementation]$(SCREEN_INC))
 
 
 lynx :	lynx.exe
@@ -164,7 +156,7 @@ lynx :	lynx.exe
 HDRS = [.chrtrans]iso01_uni.h
 
 lynx.exe :   $(HDRS) $(OBJS) $(WWWLIB)
-	$(LINK) /Executable = Lynx.exe $(OBJS), $(WWWLIB)/lib, $(TOPT)/opt, $(COPT)/opt
+	$(LINK) /Executable = Lynx.exe $(OBJS), $(WWWLIB)/lib $(SCREEN_LIB) $(TOPT) $(COPT)
 
 $(HDRS) :
 	set default [.chrtrans]
diff --git a/userdefs.h b/userdefs.h
index 07c4617d..bf532b1c 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.6pre.3"
+#define LYNX_VERSION "2.8.6pre.4"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sun, 10 Sep 2006 16:38:39 -0700"
+#define LYNX_DATE "Mon, 18 Sep 2006 17:28:28 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-04 07:37:15 +0000