* wl.el (wl-plugged-set-variables, wl-plugged-dop-queue-info)

[elisp/wanderlust.git] / WL-MK

diff --git a/WL-MK b/WL-MK
index 99f9256..89d7af2 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -63,7 +63,7 @@
   (defmacro defgroup (&rest args))
   (defmacro defcustom (symbol value &optional doc &rest args)
     (let ((doc (concat "*" (or doc ""))))
-      (` (defvar (, symbol) (, value) (, doc))))))
+      `(defvar ,symbol ,value ,doc))))
 
 (load "bytecomp" nil t)
 
@@ -310,22 +310,12 @@
   (config-wl-package-subr)
   ;; PACKAGEDIR check.
   (let (package-dir)
-    (and (setq package-dir (car command-line-args-left))
-        (if (string= "NONE" package-dir)
-            (defvar PACKAGEDIR
-              (if (boundp 'early-packages)
-                  (let ((dirs (append (if early-package-load-path
-                                          early-packages)
-                                      (if late-package-load-path
-                                          late-packages)
-                                      (if last-package-load-path
-                                          last-packages)))
-                        dir)
-                    (while (not (file-exists-p
-                                 (setq dir (car dirs))))
-                      (setq dirs (cdr dirs)))
-                    dir)))
-          (defvar PACKAGEDIR package-dir)))
+    (defvar PACKAGEDIR
+      (if (and (setq package-dir (car command-line-args-left))
+              (not (string= "NONE" package-dir)))
+         package-dir
+       (require 'install)
+       (install-get-default-package-directory)))
     (princ (format "PACKAGEDIR is %s\n" PACKAGEDIR))
     (setq command-line-args-left (cdr command-line-args-left)))
   ;; PIXMAPDIR check.
@@ -534,7 +524,7 @@
                  (version-tmp (split-string (match-string 1) "\\."))
                  version news-string end)
              (while version-tmp
-               (setq version (append version (list (string-to-int (car version-tmp)))))
+               (setq version (append version (list (string-to-number (car version-tmp)))))
                (setq version-tmp (cdr version-tmp)))
              (re-search-forward "^\\(\\* \\|\f\\)" nil t)
              (goto-char (- (match-beginning 0) 1))