diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-10 16:08:19 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-10 16:08:19 +0000 |
| commit | 900d16573c6efcdca06925ca66f9fe9ef5a845ec (patch) | |
| tree | 024475070996701b912eab600528e8cc63a43754 /buffer.c | |
| parent | [w3m-dev 03619] Re: Error occured while reset (diff) | |
| download | w3m-900d16573c6efcdca06925ca66f9fe9ef5a845ec.tar.gz w3m-900d16573c6efcdca06925ca66f9fe9ef5a845ec.zip | |
[w3m-dev 03620] -m option and header
* buffer.c (reshapeBuffer): fix reading from stdin
fix -m option
* display.c (redrawNLine): rewrite
(redrawLine): return l instead of l->next
(redrawLineImage): ditto
* file.c (loadFile): read header even if skip header
(loadGeneralFile): read header even if skip header
* fm.h (SkipHeader): added
* main.c (main): check whether reading from stdin
SkipHeader
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to 'buffer.c')
| -rw-r--r-- | buffer.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $Id: buffer.c,v 1.16 2002/12/02 17:27:36 ukai Exp $ */ +/* $Id: buffer.c,v 1.17 2003/01/10 16:08:20 ukai Exp $ */ #include "fm.h" #ifdef USE_MOUSE @@ -530,9 +530,9 @@ reshapeBuffer(Buffer *buf) UseContentCharset = FALSE; UseAutoDetect = FALSE; #endif - if (buf->search_header && buf->currentURL.scheme == SCM_LOCAL) { - if (buf->header_source && (buf->mailcap_source || - !strcmp(buf->currentURL.file, "-"))) { + if (buf->header_source) { + if (buf->currentURL.scheme != SCM_LOCAL || + buf->mailcap_source || !strcmp(buf->currentURL.file, "-")) { URLFile h; init_stream(&h, SCM_LOCAL, NULL); examineFile(buf->header_source, &h); @@ -540,8 +540,8 @@ reshapeBuffer(Buffer *buf) readHeader(&h, buf, TRUE, NULL); UFclose(&h); } - } - else + } + else if (buf->search_header) /* -m option */ readHeader(&f, buf, TRUE, NULL); } |