From 2033fa16bcf15aff2678e153c97ec6b89b161702 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Wed, 13 Mar 2002 15:51:36 +0000 Subject: [w3m-dev 03126] reshapeBuffer() and -m option * buffer.c (reshapeBuffer): fix reshapeBuffer() in case of -m option From: Hironori Sakamoto --- ChangeLog | 7 ++++++- buffer.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58b6925..64099f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-03-14 Hironori Sakamoto + + * [w3m-dev 03126] reshapeBuffer() and -m option + * buffer.c (reshapeBuffer): fix reshapeBuffer() in case of -m option + 2002-03-14 Hironori Sakamoto * [w3m-dev 03125] w3m -m < image @@ -3132,4 +3137,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.345 2002/03/13 15:48:20 ukai Exp $ +$Id: ChangeLog,v 1.346 2002/03/13 15:51:36 ukai Exp $ diff --git a/buffer.c b/buffer.c index d306f92..4c341fa 100644 --- a/buffer.c +++ b/buffer.c @@ -1,4 +1,4 @@ -/* $Id: buffer.c,v 1.10 2002/01/31 17:54:49 ukai Exp $ */ +/* $Id: buffer.c,v 1.11 2002/03/13 15:51:36 ukai Exp $ */ #include "fm.h" #ifdef USE_MOUSE @@ -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 -- cgit v1.2.3