avoid decoding when dump_extra option is specified.

2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 367f6f7..a9c7ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-06-07  Dai Sato  <satodai@w3m.jp>
+2006-06-10  Dai Sato  <satodai@w3m.jp>
+
+	* fix for [w3m-dev-en 01067] Some more patches
+	* file.c (loadGeneralFile): avoid decoding when dump_extra option is specified.
+
+2006-06-10  Dai Sato  <satodai@w3m.jp>
 
 	* [w3m-dev 03992] Change to display progress status when dump_extra option is specified
 	* file.c (loadHTMLstream): Show progress status when dump_extra option is specified.
@@ -8738,4 +8743,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.966 2006/06/10 10:01:18 inu Exp $
+$Id: ChangeLog,v 1.967 2006/06/10 11:09:06 inu Exp $
diff --git a/file.c b/file.c
index 1433ad3..b3552dc 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.244 2006/06/10 10:01:18 inu Exp $ */
+/* $Id: file.c,v 1.245 2006/06/10 11:09:06 inu Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -2126,7 +2126,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	return NO_BUFFER;
     }
 
-    if (f.content_encoding != CMP_NOCOMPRESS) {
+    if ((f.content_encoding != CMP_NOCOMPRESS) && !(w3m_dump & DUMP_EXTRA)) {
 	uncompress_stream(&f, &pu.real_file);
     }
     else if (f.compression != CMP_NOCOMPRESS) {