* elmo-imap4.el (elmo-imap4-clear-login): Don't send LOGIN command

[elisp/wanderlust.git] / WL-MK

diff --git a/WL-MK b/WL-MK
index c2befaf..2513518 100644 (file)
--- a/WL-MK
+++ b/WL-MK
@@ -37,8 +37,8 @@
 (defconst wl-news-news-file '(("en" "NEWS")
                              ("ja" "NEWS.ja")))
 (defconst wl-news-search-regexp
-  '(("en" "^\\* Changes in \\([0-9.]*\\) from")
-    ("ja" "^\\* [0-9.]* \e$B$+$i\e(B \\([0-9.]*\\) \e$B$X$NJQ99E@\e(B")))
+  '(("en" "^\\* Changes in \\([0-9.]*\\) from [0-9.]+x?")
+    ("ja" "^\\* [0-9.]+x? \e$B$+$i\e(B \\([0-9.]*\\) \e$B$X$NJQ99E@\e(B")))
 (defconst wl-news-filename "wl-news.el")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -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.