* INSTALL, INSTALL.ja: Added System Requirements.

[elisp/wanderlust.git] / WL-MK

diff --git a/WL-MK b/WL-MK
index 043cc58..0026e0a 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -43,7 +43,7 @@
             ;; ignore broken module
             (not (featurep 'tinycustom)))
   (when (and (boundp 'emacs-major-version)
-            (eq emacs-major-version 19)
+            (= emacs-major-version 19)
             (>= emacs-minor-version 29))
     (message "%s" "
   Warning: You don't seem to have \"new custom\" package installed.
@@ -96,7 +96,6 @@
     (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
@@ -106,11 +105,11 @@
     (load "./WL-ELS" nil nil t)
     (condition-case ()
        (require 'mime-setup)
-      (error (error "No MIME module was detected. Please install SEMI.")))
+      (error (error "No MIME module was detected.  Please install SEMI")))
     ;; smtp.el version check.
     (require 'smtp)
     (if (not (fboundp 'smtp-send-buffer))
-       (error "Please install new FLIM.  See INSTALL or INSTALL.ja."))))
+       (error "Please install new FLIM.  See INSTALL or INSTALL.ja"))))
 
 (defun config-wl-pixmap-dir (&optional packagedir)
   "Examine pixmap directory where icon files should go."
@@ -208,10 +207,11 @@
       (make-directory PIXMAPDIR t))
   (let* ((case-fold-search t)
         (icons (directory-files ICONDIR t
-                                (cond ((or (featurep 'xemacs)
-                                           (and (boundp 'emacs-major-version)
-                                                (>= emacs-major-version 21)))
+                                (cond ((featurep 'xemacs)
                                        "\\.x[bp]m$")
+                                      ((and (boundp 'emacs-major-version)
+                                            (>= emacs-major-version 21))
+                                       "\\.img$\\|\\.x[bp]m$")
                                       ((featurep 'mule)
                                        "\\.img$\\|\\.xbm$"))))
         icon dest)
@@ -263,7 +263,7 @@
 
 (defun config-wl-package-xmas ()
   (if (not (featurep 'xemacs))
-      (error "This directive is only for XEmacs."))
+      (error "This directive is only for XEmacs"))
   (config-wl-package-subr)
   ;; PACKAGEDIR check.
   (let (package-dir)