From 2440da2d6955b99d14ab955db2983c37b448710b Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Tue, 18 Sep 2001 07:29:06 +0000
Subject: [PATCH] * wl.el (wl-check-environment): If `wl-from' is nil, use
 default value.

* wl-vars.el (wl-from): Set default value as nil.
(wl-organization): Sed default value as ORGANIZATION environment variable.

* wl-draft.el (wl-smtp-extension-bind): Check value of wl-smtp-connection-type.

* wl-acap.el (wl-acap-init): If ACAP service is not found, cause an error.
---
 wl/ChangeLog   |   14 ++++++++++++++
 wl/wl-acap.el  |    1 +
 wl/wl-draft.el |    2 +-
 wl/wl-vars.el  |    8 ++++----
 wl/wl.el       |    4 +++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 14abd3c..f9703e2 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl.el (wl-check-environment): If `wl-from' is nil, use default value.
+
+	* wl-vars.el (wl-from): Set default value as nil.
+	(wl-organization): Sed default value as ORGANIZATION environment
+	variable.
+
+	* wl-draft.el (wl-smtp-extension-bind): Check value of
+	wl-smtp-connection-type.
+
+	* wl-acap.el (wl-acap-init): If ACAP service is not found, cause an
+	error.
+
 2001-09-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* Version number is increased to 2.7.4.
diff --git a/wl/wl-acap.el b/wl/wl-acap.el
index 818663e..3f9a8dd 100644
--- a/wl/wl-acap.el
+++ b/wl/wl-acap.el
@@ -100,6 +100,7 @@ If nil, default acap port is used."
   "A candidate for `wl-folder-init-function'."
   (let ((service (wl-acap-find-acap-service))
 	proc entries settings folder-top type)
+    (unless (car service) (error "No ACAP service found."))
     (setq proc (acap-open (car service)
 			  wl-acap-user
 			  (upcase (symbol-name wl-acap-authenticate-type))
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 2a766ea..1e43ff7 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -102,7 +102,7 @@
 			     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-use-starttls (eq wl-smtp-connection-type 'starttls))
 	    smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
        (if (and (string= (car smtp-sasl-mechanisms) "DIGEST-MD5")
 		;; sendmail bug?
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 3a2e222..457fc7b 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -131,10 +131,10 @@
 (defvar wl-use-semi (module-installed-p 'mime-view) ; If nil, use tm.
   "*Use SEMI or not.")
 
-(defcustom wl-from (if (boundp 'user-mail-address)
-		       user-mail-address)
+(defcustom wl-from nil
   "*From string used in draft."
-  :type 'string
+  :type  '(choice (const :tag "Use default value" nil)
+		  string)
   :group 'wl
   :group 'wl-setting)
 
@@ -147,7 +147,7 @@ If you don't have multiple e-mail addresses, you don't have to set this."
   :group 'wl
   :group 'wl-setting)
 
-(defcustom wl-organization nil
+(defcustom wl-organization (getenv "ORGANIZATION")
   "Organization name."
   :type '(choice (const :tag "none" nil)
                  string)
diff --git a/wl/wl.el b/wl/wl.el
index 192160d..48dc2cb 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -691,7 +691,9 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 
 (defun wl-check-environment (no-check-folder)
   (unless wl-from
-    (error "Please set `wl-from'"))
+    (setq wl-from
+	  (concat (wl-address-quote-specials (user-full-name))
+		  " <" user-mail-address ">")))
   ;; Message-ID
   (unless (string-match "[^.]\\.[^.]" (or wl-message-id-domain
 					  (if wl-local-domain
-- 
1.7.10.4