[w3m-dev 03135] commit of [w3m-dev 03006] is incomplete.

* file.c (HTMLlineproc2body): check form_int fid attr
		update forms[]
		fix buf->formlist
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

2 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index eadb9b5..60cfe3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-20  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03135] commit of [w3m-dev 03006] is incomplete.
+	* file.c (HTMLlineproc2body): check form_int fid attr
+			update forms[]
+			fix buf->formlist
+
 2002-03-16  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* part of [w3m-dev-en 00713] contrib: unofficial "current page info" patch, updated for w3m-0.3
@@ -3235,4 +3242,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.355 2002/03/15 18:48:55 ukai Exp $
+$Id: ChangeLog,v 1.356 2002/03/19 15:54:47 ukai Exp $
diff --git a/file.c b/file.c
index f4c7c2f..4fe12a6 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.87 2002/03/15 19:02:40 ukai Exp $ */
+/* $Id: file.c,v 1.88 2002/03/19 15:54:47 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -5078,7 +5078,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
 		    internal = HTML_N_INTERNAL;
 		    break;
 		case HTML_FORM_INT:
-		    process_form(tag);
+		    if (parsedtag_get_value(tag, ATTR_FID, &form_id))
+			process_form_int(tag, form_id);
 		    break;
 		case HTML_TEXTAREA_INT:
 		    if (parsedtag_get_value(tag, ATTR_TEXTAREANUMBER,
@@ -5187,12 +5188,14 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
     }
     if (w3m_debug)
 	fclose(debug);
+    for (form_id = 1; form_id <= form_max; form_id++)
+	forms[form_id]->next = forms[form_id - 1];
+    buf->formlist = (form_max >= 0) ? forms[form_max] : NULL;
     if (n_textarea)
 	addMultirowsForm(buf, buf->formitem);
 #ifdef USE_IMAGE
     addMultirowsImg(buf, buf->img);
 #endif
-    buf->formlist = (form_max >= 0) ? forms[form_max] : NULL;
 }
 
 void