w3m

commit f441f1fc68cef3f80cfc8e3c38e542683664803c
parent d78d9babc0ba0b4d6c374feed1ceef0531d90dca
Author: ukai <ukai>
Date:   Wed, 13 Mar 2002 15:51:36 +0000

[w3m-dev 03126] reshapeBuffer() and -m option
* buffer.c (reshapeBuffer): fix reshapeBuffer() in case of -m option
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
buffer.c
 | 
5
+++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
 2002-03-14  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03126] reshapeBuffer() and -m option
+	* buffer.c (reshapeBuffer): fix reshapeBuffer() in case of -m option
+
+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
 
diff --git a/buffer.c b/buffer.c
@@ -497,6 +497,9 @@ reshapeBuffer(Buffer *buf)
     buf->need_reshape = FALSE;
     if (buf->sourcefile == NULL)
 	return;
+    if (buf->currentURL.scheme == SCM_LOCAL &&
+	!strcmp(buf->currentURL.file, "-"))
+	return;
     init_stream(&f, SCM_LOCAL, NULL);
     examineFile(buf->mailcap_source ? buf->mailcap_source : buf->sourcefile,
 		&f);
@@ -520,6 +523,8 @@ reshapeBuffer(Buffer *buf)
     UseContentCharset = FALSE;
     UseAutoDetect = FALSE;
 #endif
+    if (buf->search_header && buf->currentURL.scheme == SCM_LOCAL)
+	readHeader(&f, buf, TRUE, NULL);
     if (!strcasecmp(buf->type, "text/html"))
 	loadHTMLBuffer(&f, buf);
     else