* wl.el (wl): Enclose `wl-check-environment' with `condition-case' again

(Reverted the change on 2002-01-17 by OKADA san).

diff --git a/wl/ChangeLog b/wl/ChangeLog
index e5a293d..cf842d5 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-23  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl.el (wl): Enclose `wl-check-environment' with `condition-case'
+       again (Reverted the change on 2002-01-17 by OKADA san).
+
 2002-01-23  Kenichi OKADA  <okada@opaopa.org>
 
        * wl-draft.el (wl-draft): Rewrite.

diff --git a/wl/wl.el b/wl/wl.el
index cb0315e..7a06243 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -810,14 +810,16 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
     (condition-case obj
        (progn
          (if check
-             (progn
-               (message "Checking environment...")
-               (wl-check-environment arg)
-               (message "Checking environment...done")
-               (message "Checking type of variables...")
-               (wl-check-variables)
-               (wl-check-variables-2)
-               (message "Checking type of variables...done")))
+             (condition-case nil
+                 (progn
+                   (message "Checking environment...")
+                   (wl-check-environment arg)
+                   (message "Checking environment...done")
+                   (error quit))))
+         (message "Checking type of variables...")
+         (wl-check-variables)
+         (wl-check-variables-2)
+         (message "Checking type of variables...done")
          (wl-plugged-init (wl-folder arg))
          (unless arg
            (run-hooks 'wl-auto-check-folder-pre-hook)