(elmo-folder-list-messages): Merge lists only if both

list is non-nil.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 4d363bf..fcc8980 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-16  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo.el (elmo-folder-list-messages): Merge lists only if both
+       list is non-nil.
+
 2004-04-16  YAMASHITA Junji <ysjj@unixuser.org>
 
        * elmo.el (elmo-folder-list-messages): Use elmo-uniq-sorted-list.

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 59c6b86..3db2fcc 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -232,7 +232,7 @@ If second optional IN-MSGDB is non-nil, only messages in the msgdb are listed.")
       (setq list (elmo-msgdb-list-messages (elmo-folder-msgdb folder))))
     (if visible-only
        (elmo-living-messages list killed-list)
-      (if in-msgdb
+      (if (and in-msgdb killed-list)
          (elmo-uniq-sorted-list
           (sort (nconc (elmo-number-set-to-number-list killed-list) list) #'<)
           #'eq)