Index: file.c
===================================================================
RCS file: /home/okabe/CVS_DB/w3m/file.c,v
retrieving revision 1.22.2.65
diff -u -r1.22.2.65 file.c
--- file.c	2000/12/21 20:36:25	1.22.2.65
+++ file.c	2000/12/25 12:08:50
@@ -3958,7 +3958,6 @@
 	fclose(f);
     }
 
-  beginning:
     /* comment processing */
     if (obuf->status == R_ST_CMNT || obuf->status == R_ST_NCMNT3 ||
 	obuf->status == R_ST_IRRTAG) {
@@ -3981,10 +3980,13 @@
     while (*str != '\0') {
 	int is_tag = FALSE;
 
+	if (obuf->flag & RB_PLAIN)
+	    goto read_as_plain;		/* don't process tag */
+
 	if (*str == '<' || ST_IS_TAG(obuf->status)) {
 	    int pre_mode = (obuf->table_level >= 0) ?
-		tbl_mode->pre_mode & (TBLM_XMP | TBLM_LST) :
-		obuf->flag & (RB_XMPMODE | RB_LSTMODE);
+		tbl_mode->pre_mode & TBLM_PLAIN :
+		obuf->flag & RB_PLAINMODE;
 	    /* 
 	     * Tag processing
 	     */
@@ -4013,8 +4015,6 @@
 	    }
 	    if (h_env->tagbuf->length == 0)
 		continue;
-	    if (obuf->flag & RB_PLAIN)
-		goto read_as_plain;		/* don't process tag */
 	    if (obuf->status != R_ST_NORMAL) {
 		if (!pre_mode) {
 		    if (Strlastchar(h_env->tagbuf) == '\n')
@@ -4184,7 +4184,7 @@
 		} while (obuf->pos % Tabstop != 0);
 		str++;
 	    }
-	    else if (obuf->flag & (RB_XMPMODE | RB_LSTMODE)) {
+	    else if (obuf->flag & RB_PLAINMODE) {
 		char *p = htmlquote_char(*str);
 		if (p) {
 		    push_charp(obuf, 1, p, PC_ASCII);
@@ -4265,9 +4265,8 @@
 	    }
 	}
     }
-    if (!(obuf->flag & (RB_PREMODE | RB_NOBR | RB_INTXTA
-			| RB_INSELECT
-			| RB_XMPMODE | RB_LSTMODE | RB_IGNORE))) {
+    if (!(obuf->flag & (RB_PREMODE | RB_NOBR | RB_INTXTA | RB_INSELECT
+			| RB_PLAINMODE | RB_IGNORE))) {
 	char *tp;
 	int i = 0;
 
Index: fm.h
===================================================================
RCS file: /home/okabe/CVS_DB/w3m/fm.h,v
retrieving revision 1.7.2.29
diff -u -r1.7.2.29 fm.h
--- fm.h	2000/12/17 09:26:06	1.7.2.29
+++ fm.h	2000/12/25 11:47:17
@@ -414,6 +414,7 @@
 #define RB_PRE_INT	0x100
 #define RB_PREMODE	(RB_PRE | RB_PRE_INT)
 #define RB_SPECIAL	(RB_PRE|RB_XMPMODE|RB_LSTMODE|RB_PLAIN|RB_NOBR|RB_PRE_INT)
+#define RB_PLAINMODE	(RB_XMPMODE|RB_LSTMODE|RB_PLAIN)
 
 #define RB_IN_DT	0x200
 #define RB_INTXTA	0x400
Index: table.c
===================================================================
RCS file: /home/okabe/CVS_DB/w3m/table.c,v
retrieving revision 1.9.2.30
diff -u -r1.9.2.30 table.c
--- table.c	2000/12/21 17:40:31	1.9.2.30
+++ table.c	2000/12/25 11:52:37
@@ -2980,7 +2980,7 @@
 		line = parsedtag2str(tag)->ptr;
 	}
 	else {
-	    if (!(mode->pre_mode & (TBLM_XMP|TBLM_LST)))
+	    if (!(mode->pre_mode & TBLM_PLAIN))
 		return -1;
 	}
     }
@@ -2998,7 +2998,7 @@
 	feed_select(line);
 	return -1;
     }
-    if (!(mode->pre_mode & (TBLM_XMP|TBLM_LST)) &&
+    if (!(mode->pre_mode & TBLM_PLAIN) &&
 	!(*line == '<' && line[strlen(line) - 1] == '>') &&
 	strchr(line, '&') != NULL) {
 	tmp = Strnew();
@@ -3054,7 +3054,7 @@
 	check_rowcol(tbl, mode);
 	if (mode->pre_mode & TBLM_PRE_INT && mode->nobr_offset < 0)
 	    mode->nobr_offset = tbl->tabcontentssize;
-	if (mode->pre_mode & (TBLM_XMP|TBLM_LST))
+	if (mode->pre_mode & TBLM_PLAIN)
 	    i = strlen(line);
 	else
 	    i = maximum_visible_length(line);
Index: table.h
===================================================================
RCS file: /home/okabe/CVS_DB/w3m/table.h,v
retrieving revision 1.4.2.8
diff -u -r1.4.2.8 table.h
--- table.h	2000/12/20 20:56:13	1.4.2.8
+++ table.h	2000/12/25 11:50:39
@@ -124,6 +124,7 @@
 #define TBLM_INSELECT 128
 #define TBLM_PREMODE (TBLM_PRE|TBLM_INTXTA|TBLM_INSELECT|TBLM_XMP|TBLM_LST)
 #define TBLM_SPECIAL (TBLM_PRE|TBLM_PRE_INT|TBLM_XMP|TBLM_LST)
+#define TBLM_PLAIN (TBLM_XMP|TBLM_LST)
 #define TBLM_SCRIPT 256
 #define TBLM_STYLE 512
 #define TBLM_IGNORE (TBLM_SCRIPT|TBLM_STYLE)