aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-11-28 16:00:33 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-11-28 16:00:33 +0000
commitd6219ea37a6a98ec6c47c63d04a8caa91475f6e2 (patch)
treead2ea6be68270543bcb8478bb7518f6d058a8d38
parent[w3m-dev 03497] incorrect image size (diff)
downloadw3m-d6219ea37a6a98ec6c47c63d04a8caa91475f6e2.tar.gz
w3m-d6219ea37a6a98ec6c47c63d04a8caa91475f6e2.zip
[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 (limited to '')
-rw-r--r--ChangeLog8
-rw-r--r--file.c4
-rw-r--r--frame.c6
3 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 524cc0f..2bb5893 100644
--- 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
@@ -5242,4 +5248,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.570 2002/11/27 16:46:30 ukai Exp $
+$Id: ChangeLog,v 1.571 2002/11/28 16:00:33 ukai Exp $
diff --git a/file.c b/file.c
index 45b48ea..b3ee1ad 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.134 2002/11/27 16:40:22 ukai Exp $ */
+/* $Id: file.c,v 1.135 2002/11/28 16:00:33 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -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
index 7738c4d..ef0faec 100644
--- a/frame.c
+++ b/frame.c
@@ -1,4 +1,4 @@
-/* $Id: frame.c,v 1.21 2002/11/26 17:12:15 ukai Exp $ */
+/* $Id: frame.c,v 1.22 2002/11/28 16:00:34 ukai Exp $ */
#include "fm.h"
#include "parsetagx.h"
#include "myctype.h"
@@ -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);