[w3m-dev 02702] fix problem with emacs-w3m in [w3m-dev 02699]

From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2001-12-23 16:30:10 +00:00
parent ad72e6e164
commit 91182c5c79
2 changed files with 10 additions and 10 deletions
+7 -1
View File
@@ -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> 2001-12-23 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 02700] search refactoring * [w3m-dev 02700] search refactoring
@@ -1457,4 +1463,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-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 $
+3 -9
View File
@@ -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 #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -668,14 +668,7 @@ MAIN(int argc, char **argv, char **envp)
COLS = 80; COLS = 80;
} }
SearchHeader = FALSE; if (isatty(1) && !w3m_dump) {
DefaultType = NULL;
#ifdef JP_CHARSET
UseContentCharset = TRUE;
UseAutoDetect = TRUE;
#endif
if (isatty(1)) {
#ifdef SIGWINCH #ifdef SIGWINCH
signal(SIGWINCH, resize_hook); signal(SIGWINCH, resize_hook);
#else /* not SIGWINCH */ #else /* not SIGWINCH */
@@ -686,6 +679,7 @@ MAIN(int argc, char **argv, char **envp)
#ifdef SIGCHLD #ifdef SIGCHLD
signal(SIGCHLD, sig_chld); signal(SIGCHLD, sig_chld);
#endif #endif
#ifdef USE_BINMODE_STREAM #ifdef USE_BINMODE_STREAM
setmode(fileno(stdout), O_BINARY); setmode(fileno(stdout), O_BINARY);
#endif #endif