[w3m-dev 03073] frame + image

* file.c (loadGeneralFile): w3m_dump & ~DUMP_FRAME
* file.c (loadImageBuffer): comment out if (frame_source)
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

2 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e84cf9e..af69916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-01  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03073] frame + image
+	* file.c (loadGeneralFile): w3m_dump & ~DUMP_FRAME
+	* file.c (loadImageBuffer): comment out if (frame_source)
+
 2002-03-01  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev 03072] Proxy-Authorization (Re:  Re: https through proxy)
@@ -3020,4 +3026,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.328 2002/02/28 16:15:41 ukai Exp $
+$Id: ChangeLog,v 1.329 2002/02/28 16:21:54 ukai Exp $
diff --git a/file.c b/file.c
index 0cb8069..1d9f650 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.72 2002/02/28 16:15:41 ukai Exp $ */
+/* $Id: file.c,v 1.73 2002/02/28 16:21:54 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -1840,7 +1840,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	proc = loadBuffer;
 #ifdef USE_IMAGE
     else if (activeImage && displayImage && !useExtImageViewer &&
-	     !w3m_dump && !strncasecmp(t, "image/", 6))
+	     !(w3m_dump & ~DUMP_FRAME) && !strncasecmp(t, "image/", 6))
 	proc = loadImageBuffer;
 #endif
 #ifdef USE_GOPHER
@@ -6448,12 +6448,16 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
     tmp = Sprintf("<img src=\"%s\"><br><br>", html_quote(image->url));
     if (newBuf == NULL)
 	newBuf = newBuffer(INIT_BUFFER_WIDTH);
+/*
     if (frame_source) {
+*/
 	tmpf = tmpfname(TMPF_SRC, ".html");
 	src = fopen(tmpf->ptr, "w");
 	newBuf->sourcefile = tmpf->ptr;
 	pushText(fileToDelete, tmpf->ptr);
+/*
     }
+*/
     init_stream(&f, SCM_LOCAL, newStrStream(tmp));
     loadHTMLstream(&f, newBuf, src, TRUE);
     if (src)