X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-acap.el;h=eb4901e9ea285c9384f79057c2c20058f38c7863;hb=9e39553b80115a949a7f04ddced4459a7797f8bd;hp=62ab754b12444af0572c65a41a13d0a627881491;hpb=fd44e582ccc0cb3d87ac3ddfe83f49203326c534;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-acap.el b/wl/wl-acap.el
index 62ab754..eb4901e 100644
--- a/wl/wl-acap.el
+++ b/wl/wl-acap.el
@@ -96,15 +96,15 @@ If nil, default acap port is used."
   :type 'symbol
   :group 'wl)
 
-(defvar wl-acap-original-msgdb-dir nil)
+(defvar wl-acap-original-msgdb-directory nil)
 
 (defun wl-acap-exit ()
   "End ACAP session."
-  (setq elmo-msgdb-dir wl-acap-original-msgdb-dir))
-  
+  (setq elmo-msgdb-directory wl-acap-original-msgdb-directory))
+
 (defun wl-acap-init ()
   "A candidate for `wl-folder-init-function'."
-  (setq wl-acap-original-msgdb-dir nil)
+  (setq wl-acap-original-msgdb-directory nil)
   (condition-case nil ; catch error and quit.
   (let ((service (wl-acap-find-acap-service))
 	proc entries settings folder-top type)
@@ -169,16 +169,16 @@ If nil, default acap port is used."
     (dolist (setting settings)
       (set (car setting) (cdr setting)))
     ;; Database directory becomes specific to the ACAP server.
-    (setq wl-acap-original-msgdb-dir elmo-msgdb-dir)
-    (setq elmo-msgdb-dir (expand-file-name
-			  (concat "acap/" (car service) "/" wl-acap-user)
-			  elmo-msgdb-dir))
+    (setq wl-acap-original-msgdb-directory elmo-msgdb-directory)
+    (setq elmo-msgdb-directory (expand-file-name
+				(concat "acap/" (car service) "/" wl-acap-user)
+				elmo-msgdb-directory))
     (acap-close proc))
-  (error (when wl-acap-original-msgdb-dir
-	   (setq elmo-msgdb-dir wl-acap-original-msgdb-dir)))
-  (quit (when wl-acap-original-msgdb-dir
-	  (setq elmo-msgdb-dir wl-acap-original-msgdb-dir)))))
-  
+  (error (when wl-acap-original-msgdb-directory
+	   (setq elmo-msgdb-directory wl-acap-original-msgdb-directory)))
+  (quit (when wl-acap-original-msgdb-directory
+	  (setq elmo-msgdb-directory wl-acap-original-msgdb-directory)))))
+
 
 (defun wl-acap-create-folder-entity (string)
   (with-temp-buffer