* wl-util.el: Move (eval-when-compile (require 'static)).

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

diff --git a/wl/wl-acap.el b/wl/wl-acap.el
index f159f30..f9be6c2 100644 (file)
--- a/wl/wl-acap.el
+++ b/wl/wl-acap.el
@@ -28,14 +28,14 @@
 ;;; Code:
 ;;
 
-(cond
- ((and (not (featurep 'utf-2000))
-       (module-installed-p 'un-define))
-  (require 'un-define))
- ((and (featurep 'xemacs)
-       (not (featurep 'utf-2000))
-       (module-installed-p 'xemacs-ucs))
-  (require 'xemacs-ucs)))
+;;(cond
+;; ((and (not (featurep 'utf-2000))
+;;       (module-installed-p 'un-define))
+;;  (require 'un-define))
+;; ((and (featurep 'xemacs)
+;;       (not (featurep 'utf-2000))
+;;       (module-installed-p 'xemacs-ucs))
+;;  (require 'xemacs-ucs)))
 (require 'custom)
 (require 'cus-edit)
 (require 'wl-vars)
@@ -116,7 +116,7 @@ If nil, default acap port is used."
            proc entries settings folder-top type caches msgdb-dir)
        (if (null (car service))
            (if (setq caches
-                     (delq 
+                     (delq
                       nil
                       (mapcar
                        (lambda (dirent)
@@ -133,7 +133,7 @@ If nil, default acap port is used."
                                                   (expand-file-name
                                                    "acap"
                                                    elmo-msgdb-directory)))))))
-               (if (y-or-n-p "No ACAP service found. Try cache?")
+               (if (y-or-n-p "No ACAP service found.  Try cache? ")
                    (let (selected rpath alist)
                      (setq alist
                            (mapcar
@@ -149,8 +149,8 @@ If nil, default acap port is used."
                                  alist))
                            msgdb-dir (file-name-directory selected)
                            entries (elmo-object-load selected)))
-                 (error "No ACAP service found."))
-             (error "No ACAP service found."))
+                 (error "No ACAP service found"))
+             (error "No ACAP service found"))
          (setq proc (acap-open (car service)
                                wl-acap-user
                                (upcase (symbol-name
@@ -162,7 +162,7 @@ If nil, default acap port is used."
                                                   "/~/")
                                      '((RETURN ("*"))))))
          (when entries
-           (elmo-object-save 
+           (elmo-object-save
             (expand-file-name
              (concat "acap/" (car service) "/" wl-acap-user "/"
                      wl-acap-cache-filename)
@@ -235,7 +235,7 @@ If nil, default acap port is used."
 (defun wl-acap-create-folder-entity (string)
   (with-temp-buffer
     (message "Initializing folder...")
-    (let (folders)
+    (let (folders entity)
       (setq string (elmo-base64-decode-string string))
       (setq string (decode-coding-string string wl-acap-coding-system))
       (insert string)