From 07caebfa1b8717f97ad7de1c4d13be57abf3a216 Mon Sep 17 00:00:00 2001 From: hmurata Date: Wed, 23 Mar 2005 06:08:07 +0000 Subject: [PATCH] * modb-entity.el (elmo-msgdb-message-entity-set-number): Return `number'. * elmo-multi.el (elmo-message-entity): Don't use return value of `elmo-message-entity-set-number'. --- elmo/ChangeLog | 8 ++++++++ elmo/elmo-multi.el | 5 +++-- elmo/modb-entity.el | 3 +-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 5f003fa..b250dbb 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,11 @@ +2005-03-23 Hiroya Murata + + * modb-entity.el (elmo-msgdb-message-entity-set-number): Return + `number'. + + * elmo-multi.el (elmo-message-entity): Don't use return value of + `elmo-message-entity-set-number'. + 2005-03-22 Hiroya Murata * modb.el (modb-generic): Added slot `mime-charset'. diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el index 6c47a55..4919aee 100644 --- a/elmo/elmo-multi.el +++ b/elmo/elmo-multi.el @@ -224,8 +224,9 @@ (let* ((pair (elmo-multi-real-folder-number folder key)) (entity (elmo-message-entity (car pair) (cdr pair)))) (when entity - (elmo-message-entity-set-number (elmo-message-copy-entity entity) - key)))) + (setq entity (elmo-message-copy-entity entity)) + (elmo-message-entity-set-number entity key) + entity))) ((stringp key) (let ((children (elmo-multi-folder-children-internal folder)) (cur-number 0) diff --git a/elmo/modb-entity.el b/elmo/modb-entity.el index 3315709..1a08083 100644 --- a/elmo/modb-entity.el +++ b/elmo/modb-entity.el @@ -495,8 +495,7 @@ If each field is t, function is set as default converter." (luna-define-method elmo-msgdb-message-entity-set-number ((handler modb-legacy-entity-handler) entity number) - (and entity (aset (cdr entity) 0 number)) - entity) + (and entity (aset (cdr entity) 0 number))) (luna-define-method elmo-msgdb-message-entity-field ((handler modb-legacy-entity-handler) entity field &optional type) -- 1.7.10.4