* WL-MK (config-wl-package-subr): Don't try load `WL-ELS.el'.

And permit `WL-CFG.el' override for committer.

* WL-MK (toplevel): `file-executable-p' check use `if' instead of
`or'.

diff --git a/ChangeLog b/ChangeLog
index 51d9cb3..3aa39ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-30  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * WL-MK (config-wl-package-subr): Don't try load `WL-ELS.el'.
+       And permit `WL-CFG.el' override for committer.
+
+       * WL-MK (toplevel): `file-executable-p' check use `if' instead of
+       `or'.
+
 2000-11-20  Kenichi OKADA  <okada@opaopa.org>
 
        * WL-ELS: Remove sasl.

diff --git a/WL-MK b/WL-MK
index baeb441..041780a 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -32,7 +32,7 @@
   "The language of info file (\"ja\" or \"en\").")
 
 ;; for Nemacs (dirty!)
-(or (fboundp 'file-executable-p)
+(if (not (fboundp 'file-executable-p))
     (fset 'file-executable-p 'file-exists-p))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -86,22 +86,22 @@
 
 (defun config-wl-package-subr ()
   (unless config-wl-package-done
-  (setq config-wl-package-done t)
-  (setq load-path (cons (expand-file-name ".") load-path))
-  (setq load-path (cons (expand-file-name WLDIR)
-                       (cons (expand-file-name ELMODIR) load-path)))
-  (setq wl-icon-dir (expand-file-name ICONDIR))
-;;; load custom file if exists.
-  (load "./WL-CFG" t nil t)
-;;; load-path
-  (if wl-install-utils
-      (setq load-path (cons (expand-file-name UTILSDIR) load-path)))
-  (require 'install)
-  (load "./WL-ELS")
-  (condition-case ()
-      (require 'mime-setup)
-    (error (error "No MIME module was detected. Please install SEMI or tm.")))
-  (princ (concat "\nMIME module is " (if wl-use-semi "SEMI" "tm-8") ".\n"))))
+    (setq config-wl-package-done t)
+    (setq load-path (cons (expand-file-name ".") load-path))
+    (setq load-path (cons (expand-file-name WLDIR)
+                         (cons (expand-file-name ELMODIR) load-path)))
+    (setq wl-icon-dir (expand-file-name ICONDIR))
+    ;; load custom file if exists.  `WL-CFG.el' override for commiter.
+    (load "./WL-CFG" t nil nil)
+    ;; load-path
+    (if wl-install-utils
+       (setq load-path (cons (expand-file-name UTILSDIR) load-path)))
+    (require 'install)
+    (load "./WL-ELS" nil nil t)
+    (condition-case ()
+       (require 'mime-setup)
+      (error (error "No MIME module was detected. Please install SEMI or tm.")))
+    (princ (concat "\nMIME module is " (if wl-use-semi "SEMI" "tm-8") ".\n"))))
 
 (defun config-wl-pixmap-dir (&optional packagedir)
   "Examine pixmap directory where icon files should go."