X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=WL-MK;h=fc9b5d97ca0628417470caeba3efd8716ae284af;hb=1d7c8a8eeaa2e5e2b71b893ea47effd6b7c3ff89;hp=42039bda96f27a5d4b5de11377df9d43acd4ff74;hpb=909ddc0ca5649fcc7584bbb9c284dfb3a2b0c322;p=elisp%2Fwanderlust.git

diff --git a/WL-MK b/WL-MK
index 42039bd..fc9b5d9 100644
--- a/WL-MK
+++ b/WL-MK
@@ -14,7 +14,6 @@
 (defvar DOCDIR "./doc")
 (defvar ICONDIR "./etc/icons")
 (defvar UTILSDIR "./utils")
-(defvar SASLDIR "./utils/sasl/lisp")
 (defvar WL_PREFIX "wl")
 (defvar ELMO_PREFIX "wl")
 
@@ -22,8 +21,6 @@
 
 (defvar wl-install-utils nil
   "if Non-nil, install `wl-utils-modules'.")
-(defvar wl-install-sasl nil
-  "if Non-nil, install sasl utilities.")
 
 ;;; INFO
 (defconst wl-ja-info "wl-ja.info")
@@ -35,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))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -54,11 +51,9 @@
 	     (>= emacs-minor-version 29))
     (message "%s" "
   Warning: You don't seem to have \"new custom\" package installed.
-  It is recommended to use \"new custom\" package if you are using
-  old Emacs, such as Mule 2.3.
-  Get it from http://www.dina.kvl.dk/~abraham/custom/ and then apply
-  the patch which is included in README file of APEL package.
+           See README file of APEL package for more information.
 "))
+  (require 'backquote)
   (defmacro defgroup (&rest args))
   (defmacro defcustom (symbol value &optional doc &rest args)
     (let ((doc (concat "*" (or doc ""))))
@@ -91,27 +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)))
-  (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.")))
-  (if wl-use-semi
-      (princ (concat "\nUse SEMI"
-		     (if wl-use-luna " with LUNA\n" " without LUNA\n")))
-    (princ "\nUse tm.\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)))
+    (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."
@@ -211,7 +201,7 @@
 					  LISPDIR))
 	(elmo-install-dir (expand-file-name ELMO_PREFIX
 					    LISPDIR)))
-    (wl-uninstall (wl-scan-source (list WLDIR UTILSDIR SASLDIR))
+    (wl-uninstall (wl-scan-source (list WLDIR UTILSDIR))
 		  wl-install-dir)
     (wl-uninstall (wl-scan-source (list ELMODIR))
 		  elmo-install-dir))