diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | file.c | 10 |
2 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2002-01-30 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> + + * [w3m-dev 02929] Re: fixed w3mmail.cgi + * file.c (openPagerBuffer): use content_charset as document_code + * file.c (getNextPage): code is document_code or DocumentCode + 2002-01-30 Fumitoshi UKAI <ukai@debian.or.jp> * [w3m-dev 02928] RFC2617: HTTP Digest authentication @@ -2393,4 +2399,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.273 2002/01/29 19:08:49 ukai Exp $ +$Id: ChangeLog,v 1.274 2002/01/30 04:25:02 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.49 2002/01/29 19:08:50 ukai Exp $ */ +/* $Id: file.c,v 1.50 2002/01/30 04:25:02 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -5834,7 +5834,8 @@ openPagerBuffer(InputStream stream, Buffer *buf) buf->buffername = conv_from_system(buf->buffername); buf->bufferprop |= BP_PIPE; #ifdef JP_CHARSET - buf->document_code = DocumentCode; + if (content_charset != '\0' && UseContentCharset) + buf->document_code = content_charset; #endif buf->currentLine = buf->firstLine; @@ -5927,7 +5928,10 @@ getNextPage(Buffer *buf, int plen) } #ifdef JP_CHARSET - code = buf->document_code; + if (buf->document_code) + code = buf->document_code; + else + code = DocumentCode; #endif init_stream(&uf, SCM_UNKNOWN, NULL); for (i = 0; i < plen; i++) { |