* wl-summary.el (wl-summary-print-message-with-ps-print): Call

`elmo-message-entity-field' with 2nd argument `type'.

* elmo-util.el (elmo-map-recursive): Call `function' if `object'
is not cons cell.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 967d76a..7bdfae2 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-util.el (elmo-map-recursive): Call `function' if `object'
+       is not cons cell.
+
 2005-04-07  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * modb-entity.el (modb-entity-encode-string-recursive): Fixed

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 9c119c4..2f31109 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1595,14 +1595,17 @@ NUMBER-SET is altered."
    list-of-list))
 
 (defun elmo-map-recursive (function object)
-  (let* ((prev (list 'dummy))
-        (result prev))
-    (while (consp object)
-      (setq prev (setcdr prev (list (elmo-map-recursive function (car object))))
-           object (cdr object)))
-    (when object
-      (setcdr prev (funcall function object)))
-    (cdr result)))
+  (if (consp object)
+      (let* ((prev (list 'dummy))
+            (result prev))
+       (while (consp object)
+         (setq prev (setcdr prev (list (elmo-map-recursive function
+                                                           (car object))))
+               object (cdr object)))
+       (when object
+         (setcdr prev (funcall function object)))
+       (cdr result))
+    (funcall function object)))
 
 (defun elmo-parse (string regexp &optional matchn)
   (or matchn (setq matchn 1))

diff --git a/wl/ChangeLog b/wl/ChangeLog
index dd19c45..549bf30 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * wl-summary.el (wl-summary-print-message-with-ps-print): Call
+       `elmo-message-entity-field' with 2nd argument `type'.
+
 2005-04-04  Tetsurou Okazaki  <okazaki@be.to>
 
        * wl-action.el (wl-summary-exec): Reduce loop strength in a dolist loop.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index f41311c..d38308e 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4853,16 +4853,14 @@ If ARG is numeric number, decode message as following:
                              wl-summary-buffer-elmo-folder
                              (wl-summary-message-number))))
                   (wl-ps-subject
-                   (and entity
-                        (or (elmo-message-entity-field entity 'subject)
-                            "")))
+                   (or (elmo-message-entity-field entity 'subject 'string)
+                       ""))
                   (wl-ps-from
-                   (and entity
-                        (or (elmo-message-entity-field entity 'from) "")))
+                   (or (elmo-message-entity-field entity 'from 'string)
+                       ""))
                   (wl-ps-date
-                   (and entity
-                        (or (elmo-time-make-date-string
-                             (elmo-message-entity-field entity 'date)) ""))))
+                   (or (elmo-message-entity-field entity 'date 'string)
+                       "")))
              (run-hooks 'wl-ps-preprint-hook)
              (set-buffer wl-message-buffer)
              (copy-to-buffer buffer (point-min) (point-max))