-;;; 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>
;; 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)
(setq wl-plugged t))
((eq arg 'off)
(setq wl-plugged nil))
- (t (setq wl-plugged (null wl-plugged))))
+ (t (setq wl-plugged (not wl-plugged))))
(elmo-set-plugged wl-plugged))
(setq elmo-plugged wl-plugged
wl-modeline-plug-status wl-plugged)
(save-excursion
(beginning-of-line)
(cond
- ;; swtich variable
+ ;; switch variable
((bobp)
(let (variable switch name)
(goto-char cur-point)
(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))
(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)
(defun wl-init ()
(when (not wl-init)
- (unless (featurep 'mime-setup)
- (require 'mime-setup))
+ (require 'mime-setup)
(setq elmo-plugged wl-plugged)
(add-hook 'kill-emacs-hook 'wl-save-status)
(wl-address-init)
(run-hooks 'wl-init-hook)))
(defun wl-check-environment (no-check-folder)
- (unless wl-from
- (error "Please set `wl-from'"))
+ (unless wl-from (error "Please set `wl-from'"))
;; Message-ID
(unless (string-match "[^.]\\.[^.]" (or wl-message-id-domain
(if wl-local-domain
(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
If ARG (prefix argument) is specified, folder checkings are skipped."
(interactive "P")
(unless wl-init
- (wl-load-profile))
- (elmo-init)
+ (wl-load-profile)
+ (wl-folder-init)
+ (elmo-init))
(let (demo-buf check)
(unless wl-init
(if wl-demo (setq demo-buf (wl-demo)))
(wl-init)
(condition-case obj
(progn
- (wl-plugged-init (wl-folder arg))
(if check
(condition-case nil
(progn
(message "Checking environment...done"))
(error)
(quit)))
+ (wl-plugged-init (wl-folder arg))
(unless arg
(run-hooks 'wl-auto-check-folder-pre-hook)
(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)))