From c4307b2ed04d217b761bae0f87b5b29fcc752c2b Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Thu, 20 Sep 2001 03:57:16 +0000
Subject: [PATCH] * wl.el (wl-check-environment): Undo last change.

* wl-vars.el (wl-from): Changed default value.

* wl-draft.el (wl-draft): Don't set mark on mail body.
(wl-draft-reedit): Ditto.

* wl-address.el (wl-address-quote-specials): Define as an alias for
elmo-address-quote-specials.

* elmo-util.el (elmo-address-quote-specials): New function;
Renamed from `wl-address-quote-specials'.
---
 elmo/ChangeLog    |    5 +++++
 elmo/elmo-util.el |    8 ++++++++
 wl/ChangeLog      |   12 ++++++++++++
 wl/wl-address.el  |    8 +-------
 wl/wl-draft.el    |    6 ------
 wl/wl-vars.el     |   10 +++++++---
 wl/wl.el          |    5 +----
 7 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index dbf76d7..d3ac5ef 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-util.el (elmo-address-quote-specials): New function;
+	Renamed from `wl-address-quote-specials'.
+
 2001-09-13  Kenichi OKADA  <okada@opaopa.org>
 
 	* elmo-nntp.el (elmo-nntp-post): Fix for `elmo-default-nntp-stream-type'.
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 877a25a..57f8277 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1649,6 +1649,14 @@ the value of `foo'."
     (defalias 'elmo-field-body 'std11-fetch-field) ;;no narrow-to-region
   (defalias 'elmo-field-body 'std11-field-body))
 
+(defun elmo-address-quote-specials (word)
+  "Make quoted string of WORD if needed."
+  (let ((lal (std11-lexical-analyze word)))
+    (if (or (assq 'specials lal)
+	    (assq 'domain-literal lal))
+	(prin1-to-string word)
+      word)))
+
 (defmacro elmo-string (string)
   "STRING without text property."
   (` (let ((obj (copy-sequence (, string))))
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 28f073f..90eeab7 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,15 @@
+2001-09-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl.el (wl-check-environment): Undo last change.
+
+	* wl-vars.el (wl-from): Changed default value.
+
+	* wl-draft.el (wl-draft): Don't set mark on mail body.
+	(wl-draft-reedit): Ditto.
+
+	* wl-address.el (wl-address-quote-specials): Define as an alias for
+	elmo-address-quote-specials.
+
 2001-09-18  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl.el (wl-check-environment): If `wl-from' is nil, use default value.
diff --git a/wl/wl-address.el b/wl/wl-address.el
index ce10c21..231b3d3 100644
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -280,13 +280,7 @@ Matched address lists are append to CL."
 	(completing-read "To: " cl)
       (read-string "To: "))))
 
-(defun wl-address-quote-specials (word)
-  "Make quoted string of WORD if needed."
-  (let ((lal (std11-lexical-analyze word)))
-    (if (or (assq 'specials lal)
-	    (assq 'domain-literal lal))
-	(prin1-to-string word)
-      word)))
+(defalias 'wl-address-quote-specials 'elmo-address-quote-specials)
 
 (defun wl-address-make-completion-list (address-list)
   (let (addr-tuple cl)
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 28d216b..3a6b4a9 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1380,9 +1380,6 @@ If optional argument is non-nil, current draft buffer is killed"
 			   (1- (point)))
 			 'category 'mail-header-separator)
       (and body (insert body)))
-    (if wl-on-nemacs
-	(push-mark (point) t)
-      (push-mark (point) t t))
     (as-binary-output-file
      (write-region (point-min)(point-max) wl-draft-buffer-file-name
 		   nil t))
@@ -1486,9 +1483,6 @@ If optional argument is non-nil, current draft buffer is killed"
     (goto-char (point-min))
     (or (re-search-forward "\n\n" nil t)
 	(search-forward (concat mail-header-separator "\n") nil t))
-    (if wl-on-nemacs
-	(push-mark (point) t)
-      (push-mark (point) t t))
     (write-region (point-min)(point-max) wl-draft-buffer-file-name
 		  nil t)
     (wl-draft-overload-functions)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 148e399..620711e 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -130,10 +130,14 @@
 (defvar wl-use-semi (module-installed-p 'mime-view) ; If nil, use tm.
   "*Use SEMI or not.")
 
-(defcustom wl-from nil
+(defcustom wl-from (and user-mail-address
+			(concat (and user-full-name
+				     (concat (elmo-address-quote-specials
+					      user-full-name)
+					     " "))
+				"<" user-mail-address ">"))
   "*From string used in draft."
-  :type  '(choice (const :tag "Use default value" nil)
-		  string)
+  :type  'string
   :group 'wl)
 
 (defcustom wl-user-mail-address-list nil
diff --git a/wl/wl.el b/wl/wl.el
index 9259493..9fd1df6 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -704,10 +704,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 (defun wl-check-environment (no-check-folder)
   (unless (featurep 'mime-setup)
     (require 'mime-setup))
-  (unless wl-from
-    (setq wl-from
-	  (concat (wl-address-quote-specials (user-full-name))
-		  " <" user-mail-address ">")))
+  (unless wl-from (error "Please set `wl-from'"))
   ;; Message-ID
   (unless (string-match "[^.]\\.[^.]" (or wl-message-id-domain
 					  (if wl-local-domain
-- 
1.7.10.4