lynx-dev dev.22 patch 2 - userdefs et al

[Klaus Weide]

The below doesn't deal with userdefs.h de-MUSTification (mentioned
in another message) at all - I'll gladly leave that to Henry :)

Other remarks:
- Does it make sense to store/read partial_thres in/from .lynxrc at all?
- I think the userdefs.h text regarding *_PATH is more correct now,
  but somebody should verify; and it may have to change with what Doug
  Kaufman just suggested.

   Klaus

* Various changes to userdefs.h and lynx.cfg explanatory text.
* Corrected placement of "partial_thres" code in LYrcFile.c,
  removed an unused prototype in LYUtils.h.

--- lynx2-8-2.old/userdefs.h    Tue Apr 13 04:39:16 1999
+++ lynx2-8-2/userdefs.h        Tue Apr 20 07:08:52 1999
@@ -9,7 +9,7 @@
  * There are four sections to this document:
  *  Section 1.  Things you MUST change or verify
  *     Section 1a)  VMS specific things
- *     Section 1b)  UNIX specific things
+ *     Section 1b)  non-VMS specific things
  *     Section 1c)  ALL Platforms
  *
  *  Section 2.  Things you should probably check!
@@ -35,7 +35,7 @@
  */
 
 /*******************************************************************
- * Things you must change  VMS specific
+ * Things you must change  -  VMS specific
  *  Section 1a).
  */
 #ifdef VMS
@@ -94,8 +94,9 @@
 /**************************
  * The EXTENSION_MAP file allows you to map file suffixes to
  * mime types.
- * These global and personal files override anything in
- * lynx.cfg or src/HTInit.c
+ * The file locations defined here can be overridden in lynx.cfg.
+ * Mappings in these global and personal files override any SUFFIX
+ * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
  */
 #define GLOBAL_EXTENSION_MAP "Lynx_Dir:mime.types"
 #define PERSONAL_EXTENSION_MAP "mime.types"
@@ -103,8 +104,9 @@
 /**************************
  * The MAILCAP file allows you to map file MIME types to
  * external viewers.
- * These global and personal files override anything in
- * lynx.cfg or src/HTInit.c
+ * The file locations defined here can be overridden in lynx.cfg.
+ * Mappings in these global and personal files override any VIEWER
+ * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
  */
 #define GLOBAL_MAILCAP "Lynx_Dir:mailcap"
 #define PERSONAL_MAILCAP ".mailcap"
@@ -224,10 +226,10 @@
 #endif /* LYNX_LSS_FILE */
 
 /*******************************************************************
- * Things you must change  UNIX specific
+ * Things you must change  -  non-VMS specific
  *  Section 1b).
  */
-#else     /* UNIX */
+#else     /* non-VMS: UNIX etc. */
 
 /**************************
  * NOTE: This variable is set by the configure script; editing changes will
@@ -277,8 +279,9 @@
 /**************************
  * The EXTENSION_MAP file allows you to map file suffixes to
  * mime types.
- * These global and personal files override anything in
- * lynx.cfg or src/HTInit.c
+ * The file locations defined here can be overridden in lynx.cfg.
+ * Mappings in these global and personal files override any SUFFIX
+ * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
  */
 #define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types"
 #define PERSONAL_EXTENSION_MAP ".mime.types"
@@ -286,8 +289,9 @@
 /**************************
  * The MAILCAP file allows you to map file MIME types to
  * external viewers.
- * These global and personal files override anything in
- * lynx.cfg or src/HTInit.c
+ * The file locations defined here can be overridden in lynx.cfg.
+ * Mappings in these global and personal files override any VIEWER
+ * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
  */
 #define GLOBAL_MAILCAP "/usr/local/lib/mosaic/mailcap"
 #define PERSONAL_MAILCAP ".mailcap"
@@ -324,7 +328,9 @@
  * If the path includes a tilde (e.g, "~" or "~/lynxtmp"), Lynx will
  * replace the tilde with the full path for the user's home.
  * The definition here can be overridden at run time by setting a
- * "LYNX_TEMP_SPACE" environment symbol.
+ * "LYNX_TEMP_SPACE" environment variable, or (if that is not set)
+ * the "TMPDIR" (unix), or "TEMP" or "TMP" (Windows,DOS,OS/2)
+ * variable.
  */
 #define TEMP_SPACE "/tmp/"
 
@@ -352,8 +358,8 @@
  *     %d      date of last modification
  *     %a      anchor pointing to file or directory
  *     %A      as above but don't show symbolic links
- *     %t      type of file (description derived from MIME type)
- *     %T      MIME type as known by Lynx (from mime.types or default)
+ *     %t      type of file (description derived from MIME type)
+ *     %T      MIME type as known by Lynx (from mime.types or default)
  *     %k      size of file in Kilobytes
  *     %K      as above but omit size for directories
  *     %s      size of file in bytes
@@ -1036,8 +1042,9 @@
  * The first two settings:
  * LOCAL_EXECUTION_LINKS_ALWAYS_ON
  * LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE
- * specify the DEFAULT setting of the users execution link
- * options, but the user may still change those options.
+ * specify the DEFAULT settings of the users execution link
+ * options (they can also be overridden in lynx.cfg), but
+ * the user may still change those options.
  * If you do not wish the user to be able to change the
  * execution link settings you may wish to use the command line option:
  *    -restrictions=exec_frozen
@@ -1067,6 +1074,8 @@
  *  MAIL_SYSTEM_ERROR_LOGGING will send a message to the owner of
  *  the information if there is one, every time
  *  that a document cannot be accessed!
+ *  This is just the default, it can be changed in lynx.cfg, and error
+ *  logging can be turned off with the -nolog command line option.
  *
  *  NOTE: This can generate A LOT of mail, be warned.
  */
@@ -1078,8 +1087,10 @@
  * will get status line messages if subsequent new mail arrives.  If a jumps
  * file with a lynxprog URL for invoking mail is available, or your html
  * pages include an mail launch file URL, the user thereby can access mail
- * and read the messages.  The checks and status line reports will not be
- * performed if Lynx has been invoked with the -restrictions=mail switch.
+ * and read the messages.
+ * This is just the default, it can be changed in lynx.cfg.  The checks and
+ * status line reports will not be performed if Lynx has been invoked with
+ * the -restrictions=mail switch.
  *
  *  VMS USERS !!!
  * New mail is normally broadcast as it arrives, via "unsolicited screen
@@ -1091,14 +1102,14 @@
 #define CHECKMAIL      FALSE   /* report unread and new mail messages */
 
 /*********************************
- * VI_KEYS can be turned on by the user in the options
- * screen or the .lynxrc file.  This is just the default.
+ * VI_KEYS can be changed in lynx.cfg and can be turned on by the user
+ * in the options screen or the .lynxrc file.  This is just the default.
  */
 #define VI_KEYS_ALWAYS_ON      FALSE /* familiar h,j,k, & l */
 
 /*********************************
- * EMACS_KEYS can be turned on by the user in the options
- * screen or the .lynxrc file.  This is just the default.
+ * EMACS_KEYS can be changed in lynx.cfg and can be turned on by the user
+ * in the options screen or the .lynxrc file.  This is just the default.
  */
 #define EMACS_KEYS_ALWAYS_ON   FALSE /* familiar ^N, ^P, ^F, ^B */
 
@@ -1109,12 +1120,15 @@
  *     NUMBERS_AS_ARROWS   or
  *     LINKS_ARE_NUMBERED  or
  *     LINKS_AND_FORM_FIELDS_ARE_NUMBERED
+ *
+ * This default setting can be overridden in lynx.cfg (but not to
+ * the third value), and it can be changed at run time by the user.
  */
 #define DEFAULT_KEYPAD_MODE    NUMBERS_AS_ARROWS
 
 /********************************
  * The default search.
- * This is a default that can be overridden by the user!
+ * This is a default that can be overridden in lynx.cfg or by the user!
  */
 #define CASE_SENSITIVE_ALWAYS_ON    FALSE /* case sensitive user search */
 
@@ -1269,10 +1283,21 @@
 #define SYSTEM_MAIL "sendmail"
 #define SYSTEM_MAIL_FLAGS "-t -oi"
 /*
-**  Following executables may be sought from your PATH at run-time.
-**  To get those programs look for GNU-port stuff elsewhere.  Currently,
-**  if compiled with -DUSE_ZLIB and without -DDIRED_SUPPORT (default),
-**  you need only "cp.exe" from the list below.
+**  The following executables may be used at run time.  Unless you change
+**  the definitions to include the full directories, they will be sought
+**  from your PATH at run-time; they should be available as "cp.exe",
+**  "mv.exe" and so on.  To get those programs look for GNU-port stuff
+**  elsewhere.
+**  Currently, if compiled with -DUSE_ZLIB and without -DDIRED_SUPPORT
+**  (default), the following from the list below are required:
+**  COPY_PATH (cp.exe) - needed for file downloading
+**  MV_PATH   (mv.exe) - for bookmark handling (DEL_BOOKMARK command)
+**  UNCOMPRESS_PATH, BZIP2_PATH - for automatic decompression of files in
+**                                these formats
+**  TELNET_PATH, TN3270_PATH, RLOGIN_PATH - for access to "telnet:",
+**                                         "tn3270:", and "rlogin:" URLs.
+**  If they are not defined right, the corresponding operations may fail
+**  in unexpected and obscure ways!
 **
 **    WINDOWS/DOS
 **    ===========
--- lynx2-8-2.old/lynx.cfg      Tue Apr 13 04:39:16 1999
+++ lynx2-8-2/lynx.cfg  Tue Apr 20 05:49:40 1999
@@ -1380,8 +1380,20 @@
 # MIME types and viewers!
 #
 # file extensions may be assigned to MIME types using
-# the SUFFIX: definition.  [This has an effect for ftp and local files only,
-# http server does specify MIME type in the Content-Type header].
+# the SUFFIX: definition.  
+#
+# NOTE: It is normally preferable to define new extension mappings in
+#       EXTENSION_MAP files (see below) instead of here:  Definitions
+#       here are overriden by those in EXTENSION_MAP files and even by
+#       some built-in defaults in src/HTInit.c.
+#       Extension mappings have an effect mostly for ftp and local files,
+#       they are NOT used to determine the type of content for URLs with
+#       the http protocol.  This is because HTTP servers already specify
+#       the MIME type in the Content-Type header.  [It may still be
+#       necessary to set up an appropriate suffix for some MIME types,
+#       even if they are accessed only via the HTTP protocol, if the viewer
+#       (see below) for those MIME types requires a certain suffix for the
+#       temporary file passed to it.]
 #
 # The SUFFIX definition takes the form of:
 #    SUFFIX:<file extension>:<mime type>
@@ -1394,7 +1406,8 @@
 # The suffix definitions listed here in the default lynx.cfg file are
 # among those established via src/HTInit.c.  You can change any of the
 # defaults by editing that file, or via the global or personal mime.types
-# files at run time.  They will be overridden if you assign them here.
+# files at run time.  Assignments made here will be overridden by entries
+# in those files.
 #
 #SUFFIX:.ps:application/postscript
 #SUFFIX:.eps:application/postscript
@@ -1479,6 +1492,10 @@
 # NOTE: if you do not define a viewer to a new MIME type
 #       that you assigned above then it will be saved to
 #       disk by default.
+#       It is normally preferable to define new viewers in
+#       MAILCAP files (see below) instead of here:  Definitions
+#       here are overridden by those in MAILCAP files and even
+#       by some built-in defaults in src/HTInit.c.
 #
 # The VIEWER definition takes the form of:
 #    VIEWER:<mime type>:<viewer command>[:environment]
@@ -1507,8 +1524,8 @@
 # file are among those established via src/HTInit.c.  For the image types,
 # HTInit.c uses the XLOADIMAGE_COMMAND definition in userdefs.h or above
 # (open is used for NeXT).  You can change any of these defaults via the
-# global or personal mailcap files at run time.  They will be overridden
-# if you assign them here.
+# global or personal mailcap files.  Assignments made here will be overridden
+# by entries in those files.
 #
 #VIEWER:application/postscript:ghostview %s&:XWINDOWS
 #VIEWER:image/gif:xli %s&:XWINDOWS
--- lynx2-8-2.old/src/LYrcFile.c        Thu Mar  4 04:39:44 1999
+++ lynx2-8-2/src/LYrcFile.c    Tue Apr 20 03:37:36 1999
@@ -473,6 +473,17 @@
                user_mode = NOVICE_MODE;
            }
 
+#ifdef DISP_PARTIAL
+       /*
+        *  Partial display logic--set the threshold # of lines before
+        *  Lynx redraws the screen
+        */
+       } else if (FIND_KEYWORD(cp, "partial_thres")) {
+           cp = SkipEquals(cp);
+           if (atoi(cp) != 0)
+               partial_threshold = atoi(cp);
+#endif /* DISP_PARTIAL */
+
 #ifdef ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS
        /*
         *  Local execution mode - all links.
@@ -484,17 +495,6 @@
                local_exec = TRUE;
             else
                local_exec = FALSE;
-
-#ifdef DISP_PARTIAL
-       /*
-        *  Partial display logic--set the threshold # of lines before
-        *  Lynx redraws the screen
-        */
-       } else if (FIND_KEYWORD(cp, "partial_thres")) {
-           cp = SkipEquals(cp);
-           if (atoi(cp) != 0)
-               partial_threshold = atoi(cp);
-#endif /* DISP_PARTIAL */
 
        /*
         *  Local execution mode - only links in local files.
--- lynx2-8-2.old/src/LYUtils.h Tue Mar 30 11:10:36 1999
+++ lynx2-8-2/src/LYUtils.h     Tue Apr 20 07:08:54 1999
@@ -110,7 +110,6 @@
 extern void LYTrimRelFromAbsPath PARAMS((char *path));
 extern void LYsetXDisplay PARAMS((char *new_display));
 extern void change_sug_filename PARAMS((char *fname));
-extern void checkmail NOPARAMS;
 extern void convert_to_spaces PARAMS((char *string, BOOL condense));
 extern void free_and_clear PARAMS((char **obj));
 extern void highlight PARAMS((int flag, int cur, char *target));