From e42a4d8f6245b76951ff9b18b2917c8c4414307d Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Thu, 2 May 2002 12:41:23 +0000
Subject: [PATCH] * wl-acap.el (wl-acap-create-folder-entity): Bind unbound
 variable.

* wl-summary.el (wl-summary-sync-update): Ditto.
(wl-summary-default-from): Use wl-message-entity
instead of entity.
---
 wl/ChangeLog     |    6 ++++++
 wl/wl-acap.el    |    2 +-
 wl/wl-summary.el |   22 +++++++++++-----------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 7575cc2..d3d1d3e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,11 @@
 2002-05-02  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-acap.el (wl-acap-create-folder-entity): Bind unbound variable.
+
+	* wl-summary.el (wl-summary-sync-update): Ditto.
+	(wl-summary-default-from): Use wl-message-entity
+	instead of entity.
+
 	* wl-summary.el (wl-summary-create-line): Fix.
 
 	* wl-vars.el (wl-summary-line-format-spec-alist): New variable.
diff --git a/wl/wl-acap.el b/wl/wl-acap.el
index 1329663..c72a3d9 100644
--- a/wl/wl-acap.el
+++ b/wl/wl-acap.el
@@ -235,7 +235,7 @@ If nil, default acap port is used."
 (defun wl-acap-create-folder-entity (string)
   (with-temp-buffer
     (message "Initializing folder...")
-    (let (folders)
+    (let (folders entity)
       (setq string (elmo-base64-decode-string string))
       (setq string (decode-coding-string string wl-acap-coding-system))
       (insert string)
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index c86139f..1ec0f57 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -181,6 +181,13 @@
 (make-variable-buffer-local 'wl-summary-buffer-folder-name)
 (make-variable-buffer-local 'wl-summary-buffer-line-formatter)
 
+(defvar wl-datevec)
+(defvar wl-thr-indent-string)
+(defvar wl-thr-children-number)
+(defvar wl-thr-linked)
+(defvar wl-message-entity)
+(defvar wl-parent-message-entity)
+
 ;; internal functions (dummy)
 (unless (fboundp 'wl-summary-append-message-func-internal)
   (defun wl-summary-append-message-func-internal (entity msgdb update
@@ -194,7 +201,6 @@
       (substring subject-string (match-end 0))
     subject-string))
 
-(eval-when-compile (defvar-maybe entity nil)) ; silence byte compiler.
 (defun wl-summary-default-from (from)
   (let (retval tos ng)
     (unless
@@ -204,7 +210,8 @@
 			   (wl-summary-buffer-folder-name))
 	     (wl-address-user-mail-address-p from)
 	     (cond
-	      ((and (setq tos (elmo-msgdb-overview-entity-get-to entity))
+	      ((and (setq tos (elmo-msgdb-overview-entity-get-to
+			       wl-message-entity))
 		    (not (string= "" tos)))
 	       (setq retval
 		     (concat "To:"
@@ -222,7 +229,7 @@
 			      (wl-parse-addresses tos)
 			      ","))))
 	      ((setq ng (elmo-msgdb-overview-entity-get-extra-field
-			 entity "newsgroups"))
+			 wl-message-entity "newsgroups"))
 	       (setq retval (concat "Ng:" ng)))))
       (if wl-use-petname
 	  (setq retval (or (funcall wl-summary-get-petname-function from)
@@ -1879,7 +1886,7 @@ If ARG is non-nil, checking is omitted."
 	 curp num i new-msgdb
 	 append-list delete-list crossed
 	 update-thread update-top-list
-	 expunged mes sync-result)
+	 expunged mes sync-result entity)
     (unwind-protect
 	(progn
 	  (unless wl-summary-buffer-elmo-folder
@@ -4016,13 +4023,6 @@ If ARG, exit virtual folder."
 ;;; Summary line.
 (defvar wl-summary-line-formatter nil)
 
-(defvar wl-datevec)
-(defvar wl-thr-indent-string)
-(defvar wl-thr-children-number)
-(defvar wl-thr-linked)
-(defvar wl-message-entity)
-(defvar wl-parent-message-entity)
-
 (defun wl-summary-line-year ()
   (aref wl-datevec 0))
 (defun wl-summary-line-month ()
-- 
1.7.10.4