w3m

commit 8e57a29c68003b3f08f68fe4b7182900d51e65c3
parent 2bd441fc51e428ffb099ba3be07c4f31c4d4b055
Author: ukai <ukai>
Date:   Mon, 17 Dec 2001 16:05:03 +0000

[w3m-dev 02670]
From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
table.c
 | 
7
++-----

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git 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()
diff --git a/table.c b/table.c
@@ -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)