[w3m-dev 02670]

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>

2 files changed, 10 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 43714cc..6b8e1a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-18  Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
+
+	* [w3m-dev 02670]
+	* table.c (maximum_visible_length): use strchr()
+	* table.c (do_refill): use force==2 mode for flushline()
+
 2001-12-18  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 02669] delete cURLcode()
@@ -1279,4 +1285,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.134 2001/12/17 15:54:14 ukai Exp $
+$Id: ChangeLog,v 1.135 2001/12/17 16:05:03 ukai Exp $
diff --git a/table.c b/table.c
index 37628af..c883bf0 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.11 2001/12/14 17:58:40 ukai Exp $ */
+/* $Id: table.c,v 1.12 2001/12/17 16:05:03 ukai Exp $ */
 /* 
  * HTML table
  */
@@ -537,14 +537,11 @@ int
 maximum_visible_length(char *str)
 {
     int maxlen, len;
-    char *p;
-
-    for (p = str; *p && *p != '\t'; p++) ;
 
     visible_length_offset = 0;
     maxlen = visible_length(str);
 
-    if (*p == '\0')
+    if (!strchr(str, '\t'))
 	return maxlen;
 
     for (visible_length_offset = 1; visible_length_offset < Tabstop;
@@ -779,7 +776,7 @@ do_refill(struct table *tbl, int row, int col, int maxlimit)
 		int limit = tbl->tables[id].indent + t->total_width;
 		tbl->tables[id].ptr = NULL;
 		save_fonteffect(&h_env, h_env.obuf);
-		flushline(&h_env, &obuf, 0, 1, h_env.limit);
+		flushline(&h_env, &obuf, 0, 2, h_env.limit);
 		if (t->vspace > 0 && !(obuf.flag & RB_IGNORE_P))
 		    do_blankline(&h_env, &obuf, 0, 0, h_env.limit);
 		if (RB_GET_ALIGN(h_env.obuf) == RB_CENTER)