From d6cedb3bb49c7dbd46e0331242bf2f5ca62806cb Mon Sep 17 00:00:00 2001 From: teranisi Date: Fri, 22 Dec 2000 06:28:14 +0000 Subject: [PATCH] Sync up with wl-2.5.4. --- wl/ChangeLog | 20 +++++++++++++++- wl/wl-draft.el | 73 +++++++++++++++++++------------------------------------- wl/wl.el | 4 ++++ 3 files changed, 48 insertions(+), 49 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index a943edc..ccae2c0 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,21 @@ +2000-11-27 Kenichi OKADA + + * wl.el (wl-check-environment): Additional check for + 'wl-local-domain' and `wl-message-id-domain'. + +2000-11-19 Kenichi OKADA + + * wl-draft.el (toplevel): Delete defvar for sasl-*. + +2000-11-19 Kenichi OKADA + + * wl-draft.el (wl-smtp-extension-bind): Use `smtp-sasl-properties' + instead of `smtp-sasl-user-realm'. + +2000-11-19 Kenichi OKADA + + * wl-draft.el (wl-smtp-extension-bind): Rewrite for new SASL API. + 2000-12-19 Katsumi Yamaoka * wl-draft.el (wl-draft-reply): Bind `mime-header-lexical-analyzer' @@ -26,7 +44,7 @@ 2000-12-15 Yuuichi Teranishi * wl-summary.el (wl-summary-mark-as-important): - Remove cache if folder is local. + Remove cache if folder is local. 2000-12-06 Taro Kawagishi diff --git a/wl/wl-draft.el b/wl/wl-draft.el index b88fa02..481bfa9 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -41,10 +41,6 @@ (defvar x-face-add-x-face-version-header) (defvar mail-reply-buffer) (defvar mail-from-style) -(defvar smtp-authenticate-type) -(defvar smtp-authenticate-user) -(defvar smtp-authenticate-passphrase) -(defvar smtp-connection-type) (eval-when-compile (require 'elmo-pop3) @@ -96,51 +92,32 @@ (make-variable-buffer-local 'wl-draft-fcc-list) (make-variable-buffer-local 'wl-draft-reply-buffer) -;;; SMTP binding by Daiki Ueno -(defvar wl-smtp-features - '(((smtp-authenticate-type - (if wl-smtp-authenticate-type - (intern (downcase (format "%s" wl-smtp-authenticate-type))))) - ((smtp-authenticate-user wl-smtp-posting-user) - ((smtp-authenticate-passphrase - (elmo-get-passwd - (format "%s@%s" - smtp-authenticate-user - smtp-server)))))) - (smtp-connection-type)) - "Additional SMTP features.") - -(eval-when-compile - (defun wl-smtp-parse-extension (exts parents) - (let (bindings binding feature) - (dolist (ext exts) - (setq feature (if (listp (car ext)) (caar ext) (car ext)) - binding - (` ((, feature) - (or (, (if (listp (car ext)) - (cadar ext) - (let ((wl-feature - (intern - (concat "wl-" (symbol-name feature))))) - (if (boundp wl-feature) - wl-feature)))) - (and (boundp '(, feature)) (, feature)))))) - (when parents - (setcdr binding (list (append '(and) parents (cdr binding))))) - (setq bindings - (nconc bindings (list binding) - (wl-smtp-parse-extension - (cdr ext) (cons feature parents))))) - bindings))) - (defmacro wl-smtp-extension-bind (&rest body) - "Return a `let' form that binds all variables of SMTP extension. -After this is done, BODY will be executed in the scope -of the `let' form. - -The variables bound and their default values are described by -the `wl-smtp-features' variable." - (` (let* (, (wl-smtp-parse-extension wl-smtp-features nil)) + (` (let* ((smtp-sasl-mechanisms + (if wl-smtp-authenticate-type + (mapcar 'upcase + (if (listp wl-smtp-authenticate-type) + wl-smtp-authenticate-type + (list wl-smtp-authenticate-type))))) + (smtp-use-sasl (and smtp-sasl-mechanisms t)) + (smtp-use-starttls wl-smtp-connection-type) + smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase) + (if (and (string= (car smtp-sasl-mechanisms) "DIGEST-MD5") + ;; sendmail bug? + (string-match "^\\([^@]*\\)@\\([^@]*\\)" + wl-smtp-posting-user)) + (setq smtp-sasl-user-name (match-string 1 wl-smtp-posting-user) + smtp-sasl-properties (list 'realm + (match-string 2 wl-smtp-posting-user))) + (setq smtp-sasl-user-name wl-smtp-posting-user + smtp-sasl-properties nil)) + (setq sasl-read-passphrase + (function + (lambda (prompt) + (elmo-get-passwd + (format "%s@%s" + smtp-sasl-user-name + smtp-server))))) (,@ body)))) (defun wl-draft-insert-date-field () diff --git a/wl/wl.el b/wl/wl.el index c0e5599..e5b3926 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -714,6 +714,10 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." "." wl-local-domain) (system-name)))) (error "Please remove `@' from `wl-message-id-domain'")) + (if (string= wl-local-domain "localdomain") + (error "Please set `wl-local-domain'")) + (if (string= wl-message-id-domain "localhost.localdomain") + (error "Please set `wl-message-id-domain'")) ;; folders (when (not no-check-folder) (if (not (eq (elmo-folder-get-type wl-draft-folder) 'localdir)) -- 1.7.10.4