lynx-dev forms-options patch

[Leonid Pauzner]

>      * From: Philip Webb <address@hidden>

> there's a very misleading description of Forms Options
> in INSTALLATION, `configure' & `configure -help':

> ` --enable-forms-options ' means ` --disable-forms-menu ',
> ie if you want BOTH you should OMIT this item from configure,

For those who have difficulty with reading INSTALLATION file
and for all others this obvious patch proposed. Tom, please
correct configure help from your side also.



diff -u old/changes ./changes
--- old/changes Mon Oct  5 10:40:54 1998
+++ ./changes   Tue Oct  6 15:56:12 1998
@@ -1,6 +1,14 @@
 Changes since Lynx 2.8 release
 
================================================================================

+* Remove a note on EXP_FORMS_OPTIONS from INSTALLATION file to made
+  installation more obvious: we compile in both options menu under the cost
+  of ~30Kb extra executable size, but hold the compatibility with previous
+  versions (for those who like well-know old options menu fashion). New-style
+  menu enabled as default (check lynx.cfg for run-time switch, please).
+  EXP_FORMS_OPTIONS which(!) `#ifndef' the old-style code now #undef'ed in
+  LYGlobalDefs.h.  Let someone who worry about extra ~30Kb read this note
+  in CHANGES and tweak the code manually. - LP
 1998-10-04 (2.8.1pre.8)
 * modify HTTCP.c to copy soc_in from phost in HTParseInet, making Lynx/32 do
   lookups again - WB
Only in .: dif
diff -u old/installa ./installa
--- old/installa        Thu Oct  1 10:48:58 1998
+++ ./installa  Tue Oct  6 15:26:40 1998
@@ -255,13 +255,6 @@
        fonts) according to the current Display Character Set.  (Linux console
         only.  *Use with discretion.*  See docs/README.chartrans.)

-  --enable-forms-options                (define EXP_FORMS_OPTIONS)
-       Use forms-based options screen only.
-       Please note that a few users with broken curses may have problems
-       with popup forms fields.  (The default behaviour is to compile
-       both styles options menu code with FORMS_OPTIONS switch in lynx.cfg
-       as well as -forms_options command line toggle).
-
   --enable-internal-links              (define DONT_TRACK_INTERNAL_LINKS)
        Disabled by default, this option allows tracking of internal links,
        a feature which could, however, compromise a secure transaction by
diff -u old/lyglobal.h ./lyglobal.h
--- old/lyglobal.h      Thu Oct  1 10:49:20 1998
+++ ./lyglobal.h        Tue Oct  6 15:59:46 1998
@@ -111,8 +111,16 @@
 extern int LYChosenShowColor;  /* extended color/monochrome choice */
 extern int LYrcShowColor;      /* ... as read or last written      */

+#undef EXP_FORMS_OPTIONS
+/* We compile in both options menu under the cost
+  of ~30Kb extra executable size, but hold the compatibility with previous
+  versions (for those who like well-know old options menu fashion).
+  EXP_FORMS_OPTIONS which(!) `#ifndef' the old-style code now #undef'ed here.
+  Let someone who worry about extra ~30Kb read this note in CHANGES
+  and tweak the code manually. - LP
+*/
 #ifndef EXP_FORMS_OPTIONS
-extern BOOLEAN LYUseFormsOptions; /* use Forms-based options menu */
+extern BOOLEAN LYUseFormsOptions; /* use Forms-based options menu if we have 
choice*/
 #endif
 extern BOOLEAN LYShowCursor;   /* Show the cursor or hide it?      */
 extern BOOLEAN verbose_img;    /* display filenames of images?     */
diff -u old/lymain.c ./lymain.c
--- old/lymain.c        Sun Oct  4 23:46:02 1998
+++ ./lymain.c  Tue Oct  6 15:29:40 1998
@@ -151,7 +151,7 @@
 PUBLIC int LYChosenShowColor = SHOW_COLOR_UNKNOWN; /* whether to show and save 
*/
 PUBLIC int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... as last read or written 
*/
 #ifndef EXP_FORMS_OPTIONS
-PUBLIC BOOLEAN LYUseFormsOptions = FALSE; /* use forms-based options menu */
+PUBLIC BOOLEAN LYUseFormsOptions = TRUE; /* use forms-based options menu if we 
have chaice*/
 #endif
 PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */
 PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES;  /* show filenames or not */
diff -u old/lynx.cfg ./lynx.cfg
--- old/lynx.cfg        Sun Oct  4 23:47:18 1998
+++ ./lynx.cfg  Tue Oct  6 15:32:20 1998
@@ -388,15 +388,14 @@
 #URL_DOMAIN_SUFFIXES:.com,.edu,.net,.org

 # Lynx Options Menu style toggle: forms-based or old-style.
-# Works if old-style menu is compiled in.
-#FORMS_OPTIONS:FALSE
+#FORMS_OPTIONS:TRUE

 # Display partial pages while downloading
 #PARTIAL:TRUE

 # Set the threshold # of lines Lynx must render before it
 # redraws the screen in PARTIAL mode.  Anything < 0 implies
-# use the screen size.
+# use the screen size (suggested default).
 #PARTIAL_THRES:-1

 # While getting large files, Lynx shows the approximate rate of