* INSTALL, INSTALL.ja: Update.

[elisp/wanderlust.git] / wl / wl.el

diff --git a/wl/wl.el b/wl/wl.el
index f672bfa..21e0669 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -50,8 +50,6 @@
        (require 'wl-xmas))
       (wl-on-emacs21
        (require 'wl-e21))
-      (wl-on-nemacs
-       (require 'wl-nemacs))
       (t
        (require 'wl-mule)))
 
@@ -72,11 +70,8 @@
   (require 'cl)
   (require 'smtp)
   (require 'wl-score)
-  (unless wl-on-nemacs
-    (require 'wl-fldmgr))
-  (if wl-use-semi
-      (require 'wl-mime)
-    (require 'tm-wl)))
+  (require 'wl-fldmgr)
+  (require 'wl-mime))
 
 (defun wl-plugged-init (&optional make-alist)
   (setq elmo-plugged wl-plugged)
@@ -169,10 +164,8 @@
   (if wl-on-xemacs
       (defun wl-plugged-setup-mouse ()
        (define-key wl-plugged-mode-map 'button2 'wl-plugged-click))
-    (if wl-on-nemacs
-       (defun wl-plugged-setup-mouse ())
-      (defun wl-plugged-setup-mouse ()
-       (define-key wl-plugged-mode-map [mouse-2] 'wl-plugged-click)))))
+    (defun wl-plugged-setup-mouse ()
+      (define-key wl-plugged-mode-map [mouse-2] 'wl-plugged-click))))
 
 (unless wl-plugged-mode-map
   (setq wl-plugged-mode-map (make-sparse-keymap))
@@ -281,10 +274,10 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
       (setq last (elmo-dop-queue-fname (car dop-queue)))) ;; first
     (while dop-queue
       (when (car dop-queue)
-       (setq ope (cons (elmo-dop-queue-method (car dop-queue))
-                       (length 
+       (setq ope (cons (elmo-dop-queue-method-name (car dop-queue))
+                       (length
                         (if (listp
-                             (car 
+                             (car
                               (elmo-dop-queue-arguments (car dop-queue))))
                             (car (elmo-dop-queue-arguments
                                   (car dop-queue))))))))
@@ -296,7 +289,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
                                           (wl-folder-get-elmo-folder last))))
          (setq alist
                (wl-append-assoc-list
-                (cons (car server-info) (nth 1 server-info)) ;; server port
+                server-info
                 (cons last operation)
                 alist)))
        (when (car dop-queue)
@@ -329,7 +322,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
   (let ((buffer-read-only nil)
        (alist plugged-alist)
        (vars wl-plugged-switch-variables)
-       last server port label plugged time
+       last server port stream-type label plugged time
        line len qinfo column)
     (erase-buffer)
     (while vars
@@ -351,6 +344,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
     (while alist
       (setq server (nth 0 (caar alist))
            port (nth 1 (caar alist))
+           stream-type (nth 2 (caar alist))
            label (nth 1 (car alist))
            plugged (nth 2 (car alist))
            time (nth 3 (car alist)))
@@ -386,7 +380,8 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
               (wl-set-string-width column line)
               (wl-plugged-sending-queue-status qinfo))))
        ;; dop queue status
-       ((setq qinfo (assoc (cons server port) wl-plugged-dop-queue-alist))
+       ((setq qinfo (assoc (list server port stream-type)
+                          wl-plugged-dop-queue-alist))
        (setq line
              (concat
               (wl-set-string-width column line)
@@ -663,8 +658,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
             (> (length (visible-frame-list)) 1))
        (delete-frame))
     (setq wl-init nil)
-    (unless wl-on-nemacs
-      (remove-hook 'kill-emacs-hook 'wl-save-status))
+    (remove-hook 'kill-emacs-hook 'wl-save-status)
     t)
   (message "") ; empty minibuffer.
   )
@@ -674,17 +668,11 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
     (unless (featurep 'mime-setup)
       (require 'mime-setup))
     (setq elmo-plugged wl-plugged)
-    (unless wl-on-nemacs
-      (add-hook 'kill-emacs-hook 'wl-save-status))
+    (add-hook 'kill-emacs-hook 'wl-save-status)
     (wl-address-init)
     (wl-draft-setup)
     (wl-refile-alist-setup)
-    (if wl-use-semi
-       (progn
-         (require 'wl-mime)
-         (setq elmo-use-semi t))
-      (require 'tm-wl)
-      (setq elmo-use-semi nil))
+    (require 'wl-mime)
     ;; defined above.
     (wl-mime-setup)
     (fset 'wl-summary-from-func-internal
@@ -770,9 +758,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
   (elmo-init)
   (let (demo-buf)
     (unless wl-init
-      (if wl-demo (setq demo-buf (wl-demo))))
-    (wl-init)
-    (unless wl-init
+      (if wl-demo (setq demo-buf (wl-demo)))
       (condition-case nil
          (progn
            (message "Checking environment...")
@@ -780,6 +766,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
            (message "Checking environment...done"))
        (error)
        (quit)))
+    (wl-init)
     (condition-case obj
        (progn
          (wl-plugged-init (wl-folder arg))