w3m

commit 6176af223317bde4ca8a6f3a6e3db8b4900da838
parent 4144570e4db9b1f5c7648a4b5caba0610ccc581d
Author: ukai <ukai>
Date:   Thu, 28 Nov 2002 16:00:33 +0000

[w3m-dev 03498] Re: parse <!-- ... --> in <script>
* file.c (HTMLlineproc0): tag in textarea
* frame.c (createFrameFile): fix comment processing in frame
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
file.c
 | 
2
--
M
frame.c
 | 
4
+++-

3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-29  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03498] Re: parse <!-- ... --> in <script>
+	* file.c (HTMLlineproc0): tag in textarea
+	* frame.c (createFrameFile): fix comment processing in frame
+
 2002-11-28  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03497] incorrect image size
diff --git a/file.c b/file.c
@@ -5537,8 +5537,6 @@ HTMLlineproc0(char *str, struct html_feed_environ *h_env, int internal)
 	    if (obuf->flag & RB_INTXTA) {
 		if (cmd == HTML_N_TEXTAREA)
 		    goto proc_normal;
-		if (is_tag)
-		    continue;
 		feed_textarea(q);
 	    }
 	    else if (obuf->flag & RB_INSELECT) {
diff --git a/frame.c b/frame.c
@@ -573,8 +573,10 @@ createFrameFile(struct frameset *f, FILE * f1, Buffer *current, int level,
 			    cleanup_line(tmp, HTML_MODE);
 			    p = tmp->ptr;
 			}
-			if (status == R_ST_NORMAL || ST_IS_COMMENT(status))
+			if (status == R_ST_NORMAL)
 			    read_token(tok, &p, &status, 1, 0);
+			else if (ST_IS_COMMENT(status))
+			    read_token(tok, &p, &status, 0, 0);
 			else
 			    read_token(tok, &p, &status, 1, 1);
 		    } while (status != R_ST_NORMAL);