w3m

commit 540ca4e61d04484a9802a67ddc6a12899a8d4151
parent 8b3d1a24dc460333a78cd8968008711ad5b0aad3
Author: ukai <ukai>
Date:   Wed, 30 Jan 2002 04:25:02 +0000

[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
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
file.c
 | 
8
++++++--

2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/file.c b/file.c
@@ -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++) {