[w3m-dev 03846] fix use_history

* main.c (main): move loadHistory
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2003-04-07 15:23:57 +00:00
parent fed4922b04
commit 4a52f3f994
2 changed files with 11 additions and 6 deletions

View File

@@ -1,3 +1,8 @@
2003-04-08 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03846] fix use_history
* main.c (main): move loadHistory
2003-04-08 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03844] w3mhelp.cgi update
@@ -7669,4 +7674,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.812 2003/04/07 15:19:42 ukai Exp $
$Id: ChangeLog,v 1.813 2003/04/07 15:23:57 ukai Exp $

10
main.c
View File

@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.220 2003/04/06 16:27:54 ukai Exp $ */
/* $Id: main.c,v 1.221 2003/04/07 15:24:01 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -409,10 +409,6 @@ main(int argc, char **argv, char **envp)
ShellHist = newHist();
TextHist = newHist();
URLHist = newHist();
#ifdef USE_HISTORY
if (UseHistory)
loadHistory(URLHist);
#endif /* not USE_HISTORY */
if (!non_null(HTTP_proxy) &&
((p = getenv("HTTP_PROXY")) ||
@@ -747,6 +743,10 @@ main(int argc, char **argv, char **envp)
initCookie();
#endif /* USE_COOKIE */
setLocalCookie(); /* setup cookie for local CGI */
#ifdef USE_HISTORY
if (UseHistory)
loadHistory(URLHist);
#endif /* not USE_HISTORY */
if (w3m_backend)
backend();