lynx-dev misc fixes (patch)

[Leonid Pauzner]

Eliminate ifdefing inconsistencies in LYPrint.c/print_to_email
(it now works for _WINDOWS without WIN_EX defined) and LYMail.c
Few words from previous messages also added (OK_OVERRIDE on dos).


BTW, mail_is_blat will only work properly when all SH_EX, DOSPATH and
WIN_EX are undefined the same time. (otherwise parts of the code
became unavailable, including variable declarations in LYMail.c)

IMHO, all SH_EX symbols in LYMail.c should be moved to WIN_EX but I left
this to someone else at the moment. (mail_is_blat was written with
WIN_EX and CIGWIN in the mind so it would be OK).



diff -u old/lymail.c ./lymail.c
--- old/lymail.c        Wed Sep 29 05:40:40 1999
+++ ./lymail.c  Mon Nov  8 20:35:52 1999
@@ -1013,8 +1013,8 @@
     if (mail_is_blat)
        blat_clean();
 #endif
-#endif
 #endif /* VMS */
+#endif /* if defined(VMS) || defined(DOSPATH) || defined(WIN_EX) */

     if (traversal) {
        FILE *ofp;
@@ -2100,7 +2100,7 @@
      */
 cleanup:
     signal(SIGINT, cleanup_sig);
-#if !defined(VMS) && !defined(DOSPATH) || defined(SH_EX)
+#if !defined(VMS)
     FREE(header);
 #endif /* !VMS */

@@ -2138,7 +2138,7 @@
        lynx_force_repaint();
        refresh();
     }
-#endif /* VMS */
+#endif /* VMS || DOS */
 }

 PRIVATE void remove_tildes ARGS1(char *,string)
diff -u old/lymainlo.c ./lymainlo.c
--- old/lymainlo.c      Sun Nov  7 00:37:28 1999
+++ ./lymainlo.c        Sun Nov  7 01:56:56 1999
@@ -1854,9 +1854,6 @@
     /*
      * Don't do if not allowed or already viewing the menu.
      */
-#ifdef __DJGPP__
-    lynx_edit_mode = TRUE;
-#endif /* __DJGPP__ */
     if (lynx_edit_mode && !no_dired_support &&
        strcmp(curdoc.address, LYDiredFileURL) &&
        strcmp((curdoc.title ? curdoc.title : ""),
diff -u old/lyprint.c ./lyprint.c
--- old/lyprint.c       Thu Nov  4 16:56:10 1999
+++ ./lyprint.c Mon Nov  8 19:20:52 1999
@@ -668,7 +668,7 @@
     LYRemoveTemp(my_temp);
 #else /* !VMS (Unix or DOS) */

-#if defined(DOSPATH)
+#if defined(_WINDOWS || __DJGPP__)
     outfile_fp = LYOpenTemp(my_temp, ".txt", "w");
 #else
     HTSprintf0(&buffer, "%s %s", system_mail, system_mail_flags);
@@ -770,7 +770,7 @@
     if (keypad_mode)
        printlist(outfile_fp, FALSE);

-#if defined(WIN_EX) || defined(__DJGPP__)
+#if defined(_WINDOWS) || defined(__DJGPP__)
 #if defined(WIN_EX)    /* 1998/08/17 (Mon) 16:29:49 */
     if (mail_is_blat)
        HTSprintf0(&buffer, "%s %s -t \"%s\"",
@@ -790,9 +790,10 @@
     SetOutputMode( O_BINARY );

     LYRemoveTemp(my_temp); /* Delete the tmpfile. */
-#else /* !WIN_EX && !__DJGPP__ */
+
+#else /* Unix: */
     pclose(outfile_fp);
-#endif /* WIN_EX || __DJGPP__ */
+#endif /* _WINDOWS || __DJGPP__ */
 #endif /* VMS */

 done:  /* send_file_to_mail() */
diff -u old/makefile.dos ./makefile.dos
--- old/makefile.dos    Sun Nov  7 01:47:38 1999
+++ ./makefile.dos      Mon Nov  8 19:15:48 1999
@@ -12,7 +12,7 @@
 CFLAGS= $(MCFLAGS) -I. -I.. $(SLANGINC)

 # comment this line to suppress DIRED support
-DIRED_DEFS = -DDIRED_SUPPORT -DOK_UUDECODE -DOK_TAR -DOK_GZIP -DOK_ZIP
+DIRED_DEFS = -DDIRED_SUPPORT -DOK_UUDECODE -DOK_TAR -DOK_GZIP -DOK_ZIP 
-DOK_OVERRIDE

 CC = gcc
 MCFLAGS = -O2 -DHAVE_GETBKGD -DDISP_PARTIAL -DUSE_ZLIB \
diff -u old/makefile.dsl ./makefile.dsl
--- old/makefile.dsl    Thu Oct 21 03:21:36 1999
+++ ./makefile.dsl      Mon Nov  8 19:16:06 1999
@@ -12,7 +12,7 @@
 CFLAGS= $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC)

 # comment this line to suppress DIRED support
-DIRED_DEFS = -DDIRED_SUPPORT -DOK_UUDECODE -DOK_TAR -DOK_GZIP -DOK_ZIP
+DIRED_DEFS = -DDIRED_SUPPORT -DOK_UUDECODE -DOK_TAR -DOK_GZIP -DOK_ZIP 
-DOK_OVERRIDE

 CC = gcc
 MCFLAGS = -O2 -DDISP_PARTIAL -DUSE_ZLIB -DUSE_EXTERNALS \
diff -u old/trstable.c ./trstable.c
--- old/trstable.c      Thu Nov  4 16:56:18 1999
+++ ./trstable.c        Thu Nov  4 17:43:26 1999
@@ -109,8 +109,7 @@
 **  Implemented:
 **  - ALIGN={left,right,center,justify} applied to individual table cells
 **    ("justify" is treated as "left")
-**  - Inheritance of horizontal alignment according to HTML 4.0 (with the
-**    exception of COLGROUP/COL)
+**  - Inheritance of horizontal alignment according to HTML 4.0
 **  - COLSPAN >1 (may work incorrectly for some tables?)
 **  - ROWSPAN >1 (reserving cells in following rows)
 **  - Line breaks at start of first cell or at end of last cell are treated