aboutsummaryrefslogtreecommitdiffstats
path: root/table.c
diff options
context:
space:
mode:
authorDai Sato <satodai@w3m.jp>2006-04-05 14:18:53 +0000
committerDai Sato <satodai@w3m.jp>2006-04-05 14:18:53 +0000
commitbc7f9c90263523dc9c19c63c520cbc8f46c3cbdb (patch)
treee7632ff276fbfed9e41e487bad1375f46c1f4fa7 /table.c
parentreplace pclose passed to localcgi_post/get() with fclose in openURL() (diff)
downloadw3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.tar.gz
w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.zip
apply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006.
Diffstat (limited to '')
-rw-r--r--table.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/table.c b/table.c
index 2b0ea63..45c0daa 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.49 2004/01/09 15:46:49 ukai Exp $ */
+/* $Id: table.c,v 1.50 2006/04/05 14:18:54 inu Exp $ */
/*
* HTML table
*/
@@ -1984,7 +1984,7 @@ renderTable(struct table *t, int max_width, struct html_feed_environ *h_env)
break;
}
if (t->total_height == 0) {
- renderbuf = Strnew(" ");
+ renderbuf = Strnew_charp(" ");
t->total_height++;
t->total_width = 1;
push_render_image(renderbuf, 1, t->total_width, h_env);
@@ -2465,11 +2465,16 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
return TAG_ACTION_PLAIN;
}
if (mode->pre_mode & TBLM_INTXTA) {
- if (mode->end_tag == cmd) {
+ switch (cmd) {
+ CASE_TABLE_TAG:
+ case HTML_N_TEXTAREA:
table_close_textarea(tbl, mode, width);
- return TAG_ACTION_NONE;
+ if (cmd == HTML_N_TEXTAREA)
+ return TAG_ACTION_NONE;
+ break;
+ default:
+ return TAG_ACTION_FEED;
}
- return TAG_ACTION_FEED;
}
if (mode->pre_mode & TBLM_SCRIPT) {
if (mode->end_tag == cmd) {