From 631eee52170ec0c41fd95c54bce15e600d364cf9 Mon Sep 17 00:00:00 2001 From: kaoru Date: Sat, 30 Dec 2000 04:12:45 +0000 Subject: [PATCH] 2000-12-30 TAKAHASHI Kaoru * 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'. --- ChangeLog | 8 ++++++++ WL-MK | 38 +++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27bc7d4..17c39b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-12-30 TAKAHASHI Kaoru + + * 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-12-22 Yuuichi Teranishi * WL-ELS (SASL-MODULES): Remove scram-md5, digest-md5, unique-id; diff --git a/WL-MK b/WL-MK index 3d0693e..f0c9966 100644 --- a/WL-MK +++ b/WL-MK @@ -35,7 +35,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)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -89,24 +89,24 @@ (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))) - (if wl-install-sasl - (setq load-path (cons (expand-file-name SASLDIR) 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 committer. + (load "./WL-CFG" t nil nil) + ;; load-path + (if wl-install-utils + (setq load-path (cons (expand-file-name UTILSDIR) load-path))) + (if wl-install-sasl + (setq load-path (cons (expand-file-name SASLDIR) 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." -- 1.7.10.4