* wl-summary.el: Don't use the 3rd argument of `require' because it might be

ignored by some wrappers (e.g. jam-zcat, efs, etc.).
* wl-util.el: Ditto.
* wl-draft.el: Ditto.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 13090ad..33a27a7 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,12 @@
 2000-10-05  Katsumi Yamaoka    <yamaoka@jpl.org>
 
+       * wl-summary.el: Don't use the 3rd argument of `require' because
+       it might be ignored by some wrappers (e.g. jam-zcat, efs, etc.).
+       * wl-util.el: Ditto.
+       * wl-draft.el: Ditto.
+
+2000-10-05  Katsumi Yamaoka    <yamaoka@jpl.org>
+
        * wl-demo.el (wl-demo): Don't pass by the XEmacs routine when
        window system is not used.
 

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index a2c946d..2801cbe 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -32,7 +32,7 @@
 (require 'sendmail)
 (require 'wl-template)
 (require 'emu)
-(require 'timezone nil 'noerror)
+(condition-case nil (require 'timezone) (error nil))
 (require 'std11)
 (require 'wl-vars)
 

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index f2d04e8..34f0ac4 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -36,10 +36,10 @@
 (require 'wl-highlight)
 (require 'wl-refile)
 (require 'wl-util)
-(require 'timezone nil 'noerror)
-(require 'easymenu nil 'noerror)
+(condition-case nil (require 'timezone) (error nil))
+(condition-case nil (require 'easymenu) (error nil))
 (require 'elmo-date)
-(require 'ps-print nil 'noerror)
+(condition-case nil (require 'ps-print) (error nil))
 
 (eval-when-compile
   (require 'cl)

diff --git a/wl/wl-util.el b/wl/wl-util.el
index bfa20af..d9a90b8 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -33,8 +33,8 @@
 (eval-when-compile
   (require 'elmo-util))
 
-(require 'tm-edit nil 'noerror)
-(require 'pp nil 'noerror)
+(condition-case nil (require 'tm-edit) (error nil))
+(condition-case nil (require 'pp) (error nil))
 
 (defvar mule-version)
 (defvar nemacs-version)