w3m

commit a2075488d9e8ac704489107771e11c7130581ea3
parent 766a28a5efaee3d536eb87ed3174bd9d64ee23be
Author: ukai <ukai>
Date:   Sun, 23 Dec 2001 16:30:10 +0000

[w3m-dev 02702] fix problem with emacs-w3m in [w3m-dev 02699]
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
main.c
 | 
10
++--------

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