aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2001-12-23 16:30:10 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2001-12-23 16:30:10 +0000
commit91182c5c792e3f296c0c6d09d293f9092ef06ab6 (patch)
tree6223ea00ba86f01ba45a56b4829cf7d5fcb8bf64 /main.c
parent[w3m-dev 02700] search refactoring (diff)
downloadw3m-91182c5c792e3f296c0c6d09d293f9092ef06ab6.tar.gz
w3m-91182c5c792e3f296c0c6d09d293f9092ef06ab6.zip
[w3m-dev 02702] fix problem with emacs-w3m in [w3m-dev 02699]
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to '')
-rw-r--r--main.c12
1 files changed, 3 insertions, 9 deletions
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