From 91182c5c792e3f296c0c6d09d293f9092ef06ab6 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Sun, 23 Dec 2001 16:30:10 +0000
Subject: [w3m-dev 02702] fix problem with emacs-w3m in [w3m-dev 02699] From:
 Fumitoshi UKAI  <ukai@debian.or.jp>

---
 ChangeLog |  8 +++++++-
 main.c    | 12 +++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09c871e..54867fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-24  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 02702] fix problem with emacs-w3m in [w3m-dev 02699]
+	* main.c (MAIN): remove some flag initialization, its too early?
+		this code caused problem with emacs-w3m.
+
 2001-12-23  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev 02700] search refactoring
@@ -1457,4 +1463,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.163 2001/12/23 14:44:00 ukai Exp $
+$Id: ChangeLog,v 1.164 2001/12/23 16:30:10 ukai Exp $
diff --git a/main.c b/main.c
index dce2ea6..0cc19c4 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.42 2001/12/23 14:44:00 ukai Exp $ */
+/* $Id: main.c,v 1.43 2001/12/23 16:30:10 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -668,14 +668,7 @@ MAIN(int argc, char **argv, char **envp)
 	    COLS = 80;
     }
 
-    SearchHeader = FALSE;
-    DefaultType = NULL;
-#ifdef JP_CHARSET
-    UseContentCharset = TRUE;
-    UseAutoDetect = TRUE;
-#endif
-
-    if (isatty(1)) {
+    if (isatty(1) && !w3m_dump) {
 #ifdef SIGWINCH
 	signal(SIGWINCH, resize_hook);
 #else				/* not SIGWINCH */
@@ -686,6 +679,7 @@ MAIN(int argc, char **argv, char **envp)
 #ifdef SIGCHLD
     signal(SIGCHLD, sig_chld);
 #endif
+
 #ifdef USE_BINMODE_STREAM
     setmode(fileno(stdout), O_BINARY);
 #endif
-- 
cgit v1.2.3