lynx-dev chartrans: minor fix (patch)

[Leonid Pauzner]

* chartrans: ignore RAW_TOGGLE and do not change LYUseDefaultRawMode
  if current document's charset specified explicitely, add status message.
  (Let user switch toggle only when necessary, to avoid future problems :-)
* chartrans: change the default value of PREPEND_CHARSET_TO_SOURCE
  from FALSE to TRUE (better care than sorry).



diff -u old/lymainlo.c ./lymainlo.c
--- old/lymainlo.c      Sat Jan  2 01:11:30 1999
+++ ./lymainlo.c        Wed Jan  6 06:05:46 1999
@@ -5082,15 +5082,17 @@
            goto new_cmd;

        case LYK_RAW_TOGGLE:
-           if (LYUseDefaultRawMode)
-               LYUseDefaultRawMode = FALSE;
-           else
-               LYUseDefaultRawMode = TRUE;
-           HTUserMsg(LYRawMode ? RAWMODE_OFF : RAWMODE_ON);
-           HTMLSetCharacterHandling(current_char_set);
-           LYRawMode_flag = LYRawMode;
-           cmd = LYK_RELOAD;
-           goto new_cmd;
+           if (HTLoadedDocumentCharset()) {
+               HTUserMsg(gettext("charset for this document specified 
explicitely, sorry..."));
+               break;
+           } else {
+               LYUseDefaultRawMode = !LYUseDefaultRawMode;
+               HTUserMsg(LYRawMode ? RAWMODE_OFF : RAWMODE_ON);
+               HTMLSetCharacterHandling(current_char_set);
+               LYRawMode_flag = LYRawMode;
+               cmd = LYK_RELOAD;
+               goto new_cmd;
+           }

        case LYK_HEAD:
            if (nlinks > 0 &&


diff -u old/lymain.c ./lymain.c
--- old/lymain.c        Sat Jan  2 01:11:26 1999
+++ ./lymain.c  Wed Jan  6 06:33:48 1999
@@ -361,7 +361,7 @@
 PUBLIC BOOLEAN LYNoCc = FALSE;
 PUBLIC BOOLEAN LYPreparsedSource = FALSE;      /* Show source as preparsed?    
 */
 PUBLIC BOOLEAN LYPrependBaseToSource = TRUE;
-PUBLIC BOOLEAN LYPrependCharsetToSource = FALSE;
+PUBLIC BOOLEAN LYPrependCharsetToSource = TRUE;
 PUBLIC BOOLEAN LYQuitDefaultYes = QUIT_DEFAULT_YES;

 #ifdef DISP_PARTIAL


diff -u old/lynx.cfg ./lynx.cfg
--- old/lynx.cfg        Sat Jan  2 01:09:06 1999
+++ ./lynx.cfg  Wed Jan  6 06:33:18 1999
@@ -292,19 +292,17 @@

 # PREPEND_CHARSET_TO_SOURCE:TRUE tells Lynx to prepend a META CHARSET line
 # to text/html source files when they are retrieved for 'd'ownloading
-# or passed to 'p'rint functions.  This is necessary for resolving charset
-# for local html files, while the assume_local_charset is just an assumption.
+# or passed to 'p'rint functions, so HTTP headers will not be lost.
+# This is necessary for resolving charset for local html files,
+# while the assume_local_charset is just an assumption.
 # For the 'd'ownload option, a META CHARSET will be added only if the HTTP
-# charset is present.  The compilation default is FALSE.
+# charset is present.  The compilation default is TRUE.
 # It is generally desirable to have charset information for every local
 # html file, but META CHARSET string potentially could cause
-# compatibility problems with other browsers, so if you leave all the
-# CHARACTER_SET, ASSUME_CHARSET, ASSUME_LOCAL_CHARSET variables
-# set to their default value of iso-8859-1 you usually will not need to
-# change the compilation default for PREPEND_CHARSET_TO_SOURCE.
+# compatibility problems with other browsers, see also PREPEND_BASE_TO_SOURCE.
 # Note that the prepending is not done for -source dumps.
 #
-#PREPEND_CHARSET_TO_SOURCE:FALSE
+#PREPEND_CHARSET_TO_SOURCE:TRUE

 # NCR_IN_BOOKMARKS:TRUE allows you to save 8-bit characters in bookmark titles
 # in the unicode format (NCR).  This may be useful if you need to switch