lynx-dev dev.22 (followup patch #2)

[Leonid Pauzner]

Please add this also:


diff -u -s old/gridtext.c ./gridtext.c
--- old/gridtext.c      Tue Apr 13 02:39:16 1999
+++ ./gridtext.c        Tue Apr 13 23:11:32 1999
@@ -6193,7 +6193,8 @@
        } else {
            format = HTFileFormat(HTMainText->source_cache_file, NULL, NULL);
            format = HTCharsetFormat(format, HTMainText->node_anchor,
-                                    UCLYhndl_HTFile_for_unspec);
+                                    UCLYhndl_for_unspec);
+               /* not UCLYhndl_HTFile_for_unspec - we are talking about remote 
documents... */
        }
        CTRACE(tfp, "  Content type is \"%s\"\n", format->name);

diff -u -s old/htaccess.c ./htaccess.c
--- old/htaccess.c      Tue Apr 13 02:39:16 1999
+++ ./htaccess.c        Tue Apr 13 23:30:44 1999
@@ -580,6 +580,11 @@
            UCAssume_MIMEcharset = NULL;
            StrAllocCopy(UCAssume_MIMEcharset, anchor_UCI->MIMEname);
            pushed_assume_LYhndl = anchor_LYhndl;
+                 /* some diagnostics */
+                 if (UCLYhndl_for_unspec != anchor_LYhndl)
+                 CTRACE(tfp, "LYUCPushAssumed: UCLYhndl_for_unspec changed %d 
-> %d\n",
+                        UCLYhndl_for_unspec,
+                        anchor_LYhndl);
            UCLYhndl_for_unspec = anchor_LYhndl;
            return;
        }
@@ -592,9 +597,15 @@
  *  UCLYhndl_for_unspec used for charset "assuming" from the values
  *  saved by LYUCPushAssumed, if any. - kw
  */
-PRIVATE int LYUCPopAssumed NOARGS
+PUBLIC int LYUCPopAssumed NOARGS
 {
+
     if (pushed_assume_LYhndl >= 0) {
+                 /* some diagnostics */
+                 if (UCLYhndl_for_unspec != pushed_assume_LYhndl)
+                 CTRACE(tfp, "LYUCPopAssumed: UCLYhndl_for_unspec changed %d 
-> %d\n",
+                        UCLYhndl_for_unspec,
+                        pushed_assume_LYhndl);
        UCLYhndl_for_unspec = pushed_assume_LYhndl;
        pushed_assume_LYhndl = -1;
        FREE(UCAssume_MIMEcharset);
diff -u -s old/htaccess.h ./htaccess.h
--- old/htaccess.h      Wed Mar 17 19:17:12 1999
+++ ./htaccess.h        Tue Apr 13 23:11:32 1999
@@ -305,6 +305,7 @@

 extern void LYUCPushAssumed PARAMS((
     HTParentAnchor *   anchor));
+extern int LYUCPopAssumed NOPARAMS;

 #endif /* HTACCESS_H */
 /*
diff -u -s old/lycharse.c ./lycharse.c
--- old/lycharse.c      Tue Apr 13 02:39:16 1999
+++ ./lycharse.c        Tue Apr 13 23:11:32 1999
@@ -396,6 +396,8 @@
 PUBLIC void HTMLSetCharacterHandling ARGS1(int,i)
 {
     int chndl = safeUCGetLYhndl_byMIME(UCAssume_MIMEcharset);
+    BOOLEAN LYRawMode_flag = LYRawMode;
+    int UCLYhndl_for_unspec_flag = UCLYhndl_for_unspec;

     if (LYCharSet_UC[i].enc != UCT_ENC_CJK) {
        HTCJK = NOCJK;
@@ -483,6 +485,19 @@

     ena_csi((LYlowest_eightbit[current_char_set] > 155));

+
+    /* some diagnostics */
+    if (TRACE) {
+       if (LYRawMode_flag != LYRawMode)
+         CTRACE(tfp, "HTMLSetCharacterHandling: LYRawMode changed %s -> %s\n",
+                       (LYRawMode_flag ? "ON" : "OFF"),
+                       (LYRawMode      ? "ON" : "OFF"));
+       if (UCLYhndl_for_unspec_flag != UCLYhndl_for_unspec)
+         CTRACE(tfp, "HTMLSetCharacterHandling: UCLYhndl_for_unspec changed %d 
-> %d\n",
+                       UCLYhndl_for_unspec_flag,
+                       UCLYhndl_for_unspec);
+    }
+
     return;
 }

diff -u -s old/lymainlo.c ./lymainlo.c
--- old/lymainlo.c      Tue Apr 13 02:39:16 1999
+++ ./lymainlo.c        Wed Apr 14 04:32:12 1999
@@ -250,7 +250,7 @@
     BOOLEAN rlink_allowed;
     BOOLEAN vi_keys_flag = vi_keys;
     BOOLEAN emacs_keys_flag = emacs_keys;
-    BOOLEAN LYRawMode_flag = LYRawMode;
+    BOOLEAN LYUseDefaultRawMode_flag = LYUseDefaultRawMode;
 #ifndef NO_OPTION_MENU
     BOOLEAN LYSelectPopups_flag = LYSelectPopups;
     BOOLEAN verbose_img_flag = verbose_img;
@@ -4037,7 +4037,7 @@
                CurrentCharSet_flag != current_char_set ||
                CurrentAssumeCharSet_flag != UCLYhndl_for_unspec ||
                verbose_img_flag != verbose_img ||
-               LYRawMode_flag != LYRawMode ||
+               LYUseDefaultRawMode_flag != LYUseDefaultRawMode ||
                LYSelectPopups_flag != LYSelectPopups ||
                ((strcmp(CurrentUserAgent, (LYUserAgent ?
                                            LYUserAgent : "")) ||
@@ -4113,7 +4113,7 @@
            CurrentAssumeCharSet_flag = UCLYhndl_for_unspec;
            show_dotfiles_flag = show_dotfiles;
            verbose_img_flag = verbose_img;
-           LYRawMode_flag = LYRawMode;
+           LYUseDefaultRawMode_flag = LYUseDefaultRawMode;
            LYSelectPopups_flag = LYSelectPopups;
            StrAllocCopy(CurrentUserAgent, (LYUserAgent ?
                                            LYUserAgent : ""));
@@ -5626,7 +5626,7 @@
                LYUseDefaultRawMode = !LYUseDefaultRawMode;
                HTUserMsg(LYRawMode ? RAWMODE_OFF : RAWMODE_ON);
                HTMLSetCharacterHandling(current_char_set);
-               LYRawMode_flag = LYRawMode;
+               LYUseDefaultRawMode_flag = LYUseDefaultRawMode;
 #ifdef SOURCE_CACHE
                if (HTreparse_document()) {
                    refresh_screen = TRUE;