commit d78d9babc0ba0b4d6c374feed1ceef0531d90dca
parent 335eb1308a2ecf5f8388f0c8cad177c38ff739da
Author: ukai <ukai>
Date:   Wed, 13 Mar 2002 15:48:20 +0000
[w3m-dev 03125] w3m -m < image
* file.c (openGeneralPagerBuffer): use internal viewer for -m option
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Diffstat:
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-14  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03125] w3m -m < image
+	* file.c (openGeneralPagerBuffer): use internal viewer for -m option
+
 2002-03-13  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03116] Re: aligned block in <td align="center">
diff --git a/file.c b/file.c
@@ -6675,6 +6675,15 @@ openGeneralPagerBuffer(InputStream stream)
 	buf = openPagerBuffer(stream, t_buf);
 	buf->type = "text/plain";
     }
+#ifdef USE_IMAGE
+    else if (activeImage && displayImage && !useExtImageViewer &&
+	     !(w3m_dump & ~DUMP_FRAME) && !strncasecmp(t, "image/", 6)) {
+	cur_baseURL = New(ParsedURL);
+	parseURL("-", cur_baseURL, NULL);
+	buf = loadImageBuffer(&uf, t_buf);
+	buf->type = t;
+    }
+#endif
     else {
 	if (doExternal(uf, "-", t, &buf, t_buf)) {
 	    if (buf == NULL || buf == NO_BUFFER)