aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--main.c10
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 615ab58..a6fe388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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
* scripts/w3mhelp-funcdesc.en.pl.in: add %menu_funcdesc
* scripts/w3mhelp-funcdesc.ja.pl.in: add %menu_funcdesc
@@ -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 $
diff --git a/main.c b/main.c
index df04964..7b26a21 100644
--- a/main.c
+++ b/main.c
@@ -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();