* wl.el (wl): Call `wl-check-type'

Do not 'condition-case'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3ced531..96c2fc6 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,10 @@
 2002-01-17  Kenichi OKADA  <okada@opaopa.org>
 
+       * wl.el (wl): Call `wl-check-type'
+       Do not 'condition-case'.
+
+2002-01-17  Kenichi OKADA  <okada@opaopa.org>
+
        * wl.el (wl-check-type): New function.
        (wl-check-type-variables): New variable.
 

diff --git a/wl/wl.el b/wl/wl.el
index a95c20d..ac52444 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -796,13 +796,13 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
     (condition-case obj
        (progn
          (if check
-             (condition-case nil
-                 (progn
-                   (message "Checking environment...")
-                   (wl-check-environment arg)
-                   (message "Checking environment...done"))
-               (error)
-               (quit)))
+             (progn
+               (message "Checking environment...")
+               (wl-check-environment arg)
+               (message "Checking environment...done")
+               (message "Checking type of variables...")
+               (wl-check-type)
+               (message "Checking type of variables...done")))
          (wl-plugged-init (wl-folder arg))
          (unless arg
            (run-hooks 'wl-auto-check-folder-pre-hook)
@@ -812,6 +812,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
       (error
        (if (buffer-live-p demo-buf)
           (kill-buffer demo-buf))
+       (setq wl-init nil)
        (signal (car obj)(cdr obj)))
       (quit))
     (if (buffer-live-p demo-buf)