X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl.el;h=d97f640e9fc1f47f9f633553c15079d50c6a3699;hb=9e39553b80115a949a7f04ddced4459a7797f8bd;hp=46dc6f2537cf556f1de992e7bf98d89f7207c8c8;hpb=446bc3ed731b230a1ec244bed838bbf00b9f439a;p=elisp%2Fwanderlust.git

diff --git a/wl/wl.el b/wl/wl.el
index 46dc6f2..d97f640 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -1,4 +1,4 @@
-;;; wl.el -- Wanderlust bootstrap.
+;;; wl.el --- Wanderlust bootstrap.
 
 ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
 ;; Copyright (C) 1998,1999,2000 Masahiro MURATA <muse@ba2.so-net.ne.jp>
@@ -31,13 +31,12 @@
 ;;; Code:
 ;;
 
-(require 'mime-setup)
 (require 'elmo)
 (require 'wl-version)			; reduce recursive-load-depth
 
 ;; from x-face.el
 (unless (and (fboundp 'defgroup)
-             (fboundp 'defcustom))
+	     (fboundp 'defcustom))
   (require 'backquote)
   (defmacro defgroup (&rest args))
   (defmacro defcustom (symbol value &optional doc &rest args)
@@ -481,7 +480,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
     (save-excursion
       (beginning-of-line)
       (cond
-       ;; swtich variable
+       ;; switch variable
        ((bobp)
 	(let (variable switch name)
 	  (goto-char cur-point)
@@ -500,7 +499,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 	      (delete-region (match-beginning 2) (match-end 2))
 	      (insert (wl-plugged-string switch))
 	      (set-buffer-modified-p nil)))))
-       ;; swtich plug
+       ;; switch plug
        ((looking-at "^\\( *\\)\\[\\([^]]+\\)\\]\\([^ \n]*\\)")
 	(let* ((indent (length (elmo-match-buffer 1)))
 	       (switch (elmo-match-buffer 2))
@@ -642,8 +641,9 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 (defun wl-exit ()
   (interactive)
   (when (or (not wl-interactive-exit)
-	    (y-or-n-p "Quit Wanderlust? "))
+	    (y-or-n-p "Do you really want to quit Wanderlust? "))
     (elmo-quit)
+    (when wl-use-acap (funcall (symbol-function 'wl-acap-exit)))
     (wl-biff-stop)
     (run-hooks 'wl-exit-hook)
     (wl-save-status)
@@ -666,6 +666,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 
 (defun wl-init ()
   (when (not wl-init)
+    (require 'mime-setup)
     (setq elmo-plugged wl-plugged)
     (add-hook 'kill-emacs-hook 'wl-save-status)
     (wl-address-init)
@@ -739,11 +740,11 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 	(unless (elmo-folder-exists-p lost+found-folder)
 	  (elmo-folder-create lost+found-folder)))
       ;; tmp dir
-      (unless (file-exists-p wl-tmp-dir)
+      (unless (file-exists-p wl-temporary-file-directory)
 	(if (y-or-n-p
 	     (format "Temp directory (to save multipart) %s does not exist, create it now? "
-		     wl-tmp-dir))
-	    (make-directory wl-tmp-dir)
+		     wl-temporary-file-directory))
+	    (make-directory wl-temporary-file-directory)
 	  (error "Temp directory is not created"))))))
 
 ;;;###autoload
@@ -776,7 +777,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
 	    (wl-folder-auto-check)
 	    (run-hooks 'wl-auto-check-folder-hook))
 	  (unless arg (wl-biff-start)))
-      (error 
+      (error
        (if (buffer-live-p demo-buf)
 	   (kill-buffer demo-buf))
        (signal (car obj)(cdr obj)))