From f5f97989bac6aee7a7dbae25ee161e024d4fdde2 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Fri, 18 Jul 2003 14:26:38 +0000
Subject: [PATCH] * wl-acap.el (toplevel): Don't require un-define.

* elmo.el (elmo-message-field): Define as a method.

* elmo-multi.el (elmo-message-entity): Fixed bug when no entity found.
(elmo-message-field): Define.
---
 elmo/ChangeLog     |    5 +++++
 elmo/elmo-multi.el |   13 +++++++++----
 elmo/elmo.el       |    6 ++++--
 etc/VERSION        |    2 +-
 wl/ChangeLog       |    6 +++++-
 wl/wl-acap.el      |   16 ++++++++--------
 wl/wl-thread.el    |    3 +--
 7 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index aa31f36..796fb61 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,10 @@
 2003-07-18  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* elmo.el (elmo-message-field): Define as a method.
+
+	* elmo-multi.el (elmo-message-entity): Fixed bug when no entity found.
+	(elmo-message-field): Define.
+
 	* elmo.el (elmo-folder-list-unreads): Don't use msgdb API.
 	(elmo-folder-list-importants): Ditto.
 	(elmo-folder-list-answereds): Ditto.
diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index b854255..55a6caf 100644
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -133,10 +133,10 @@
   (cond
    ((numberp key)
     (let* ((pair (elmo-multi-real-folder-number folder key))
-	   (entity 
-	    (elmo-message-copy-entity
-	     (elmo-message-entity (car pair) (cdr pair)))))
-      (elmo-message-entity-set-number entity key)))
+	   (entity (elmo-message-entity (car pair) (cdr pair))))
+      (when entity
+	(elmo-message-entity-set-number (elmo-message-copy-entity entity)
+					key))))
    ((stringp key)
     (let ((children (elmo-multi-folder-children-internal folder))
 	  (cur-number 0)
@@ -154,6 +154,11 @@
 	(setq children (cdr children)))
       match))))
 
+(luna-define-method elmo-message-field ((folder elmo-multi-folder)
+					number field)
+  (let ((pair (elmo-multi-real-folder-number folder number)))
+    (elmo-message-field (car pair) (cdr pair) field)))
+
 (luna-define-method elmo-message-mark ((folder elmo-multi-folder) number)
   (let ((pair (elmo-multi-real-folder-number folder number)))
     (elmo-message-mark (car pair) (cdr pair))))
diff --git a/elmo/elmo.el b/elmo/elmo.el
index a4e4793..de1fa43 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1243,11 +1243,13 @@ NUMBER is a number of the message.")
 (luna-define-method elmo-message-mark ((folder elmo-folder) number)
   (elmo-msgdb-get-mark (elmo-folder-msgdb folder) number))
 
-(defun elmo-message-field (folder number field)
+(luna-define-generic elmo-message-field (folder number field)
   "Get message field value in the msgdb.
 FOLDER is the ELMO folder structure.
 NUMBER is a number of the message.
-FIELD is a symbol of the field."
+FIELD is a symbol of the field.")
+
+(luna-define-method elmo-message-field ((folder elmo-folder) number field)
   (elmo-msgdb-get-field (elmo-folder-msgdb folder) number field))
 
 (luna-define-method elmo-message-use-cache-p ((folder elmo-folder) number)
diff --git a/etc/VERSION b/etc/VERSION
index 99801b8..1808c6a 100644
--- a/etc/VERSION
+++ b/etc/VERSION
@@ -128,4 +128,4 @@
 2.10.1	Watching The Wheels
 
 2.11.x  Wonderwall
-2.11.0	Wanted Dead Or Alive
+2.11.3  Wanted Dead Or Alive
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 44e267b..ee4910c 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,4 +1,8 @@
-2003-07-18  Yuuichi Teranishi  <teranisi@ns.templewest.net>
+2003-07-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-acap.el (toplevel): Don't require un-define.
+
+2003-07-18  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-thread.el (wl-thread-delete-message): Always update
 	wl-summary-buffer-number-list.
diff --git a/wl/wl-acap.el b/wl/wl-acap.el
index 8ecd7c2..f9be6c2 100644
--- a/wl/wl-acap.el
+++ b/wl/wl-acap.el
@@ -28,14 +28,14 @@
 ;;; Code:
 ;;
 
-(cond
- ((and (not (featurep 'utf-2000))
-       (module-installed-p 'un-define))
-  (require 'un-define))
- ((and (featurep 'xemacs)
-       (not (featurep 'utf-2000))
-       (module-installed-p 'xemacs-ucs))
-  (require 'xemacs-ucs)))
+;;(cond
+;; ((and (not (featurep 'utf-2000))
+;;       (module-installed-p 'un-define))
+;;  (require 'un-define))
+;; ((and (featurep 'xemacs)
+;;       (not (featurep 'utf-2000))
+;;       (module-installed-p 'xemacs-ucs))
+;;  (require 'xemacs-ucs)))
 (require 'custom)
 (require 'cus-edit)
 (require 'wl-vars)
diff --git a/wl/wl-thread.el b/wl/wl-thread.el
index b2d2cc5..4442cd2 100644
--- a/wl/wl-thread.el
+++ b/wl/wl-thread.el
@@ -495,8 +495,7 @@ ENTITY is returned."
     (while msgs
       (setq children (wl-thread-entity-get-children
 		      (setq entity (wl-thread-get-entity (car msgs)))))
-      (when (elmo-message-entity wl-summary-buffer-elmo-folder
-				 (car msgs))
+      (when (elmo-message-entity wl-summary-buffer-elmo-folder (car msgs))
 	(wl-append ret-val (list (car msgs)))
 	(setq children nil))
       (setq msgs (cdr msgs))
-- 
1.7.10.4