1 files changed, 7 insertions, 3 deletions
diff --git a/file.c b/file.c
index b83891a..ae75b6d 100644
--- a/file.c
+++ b/file.c
@@ -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++) {