[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>
This commit is contained in:
@@ -1,3 +1,8 @@
|
|||||||
|
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>
|
2002-03-14 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
|
||||||
|
|
||||||
* [w3m-dev 03125] w3m -m < image
|
* [w3m-dev 03125] w3m -m < image
|
||||||
@@ -3132,4 +3137,4 @@
|
|||||||
* release-0-2-1
|
* release-0-2-1
|
||||||
* import w3m-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 $
|
||||||
|
7
buffer.c
7
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"
|
#include "fm.h"
|
||||||
|
|
||||||
#ifdef USE_MOUSE
|
#ifdef USE_MOUSE
|
||||||
@@ -497,6 +497,9 @@ reshapeBuffer(Buffer *buf)
|
|||||||
buf->need_reshape = FALSE;
|
buf->need_reshape = FALSE;
|
||||||
if (buf->sourcefile == NULL)
|
if (buf->sourcefile == NULL)
|
||||||
return;
|
return;
|
||||||
|
if (buf->currentURL.scheme == SCM_LOCAL &&
|
||||||
|
!strcmp(buf->currentURL.file, "-"))
|
||||||
|
return;
|
||||||
init_stream(&f, SCM_LOCAL, NULL);
|
init_stream(&f, SCM_LOCAL, NULL);
|
||||||
examineFile(buf->mailcap_source ? buf->mailcap_source : buf->sourcefile,
|
examineFile(buf->mailcap_source ? buf->mailcap_source : buf->sourcefile,
|
||||||
&f);
|
&f);
|
||||||
@@ -520,6 +523,8 @@ reshapeBuffer(Buffer *buf)
|
|||||||
UseContentCharset = FALSE;
|
UseContentCharset = FALSE;
|
||||||
UseAutoDetect = FALSE;
|
UseAutoDetect = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
if (buf->search_header && buf->currentURL.scheme == SCM_LOCAL)
|
||||||
|
readHeader(&f, buf, TRUE, NULL);
|
||||||
if (!strcasecmp(buf->type, "text/html"))
|
if (!strcasecmp(buf->type, "text/html"))
|
||||||
loadHTMLBuffer(&f, buf);
|
loadHTMLBuffer(&f, buf);
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user