(elmo-global-flags-initialize): Check the

existence of the flag directory.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 8745c48..d6b453d 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-25  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-flag.el (elmo-global-flags-initialize): Check the
+       existence of the flag directory.
+

 2005-03-23  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-access.el (elmo-folder-initialize): Call
 2005-03-23  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-access.el (elmo-folder-initialize): Call

diff --git a/elmo/elmo-flag.el b/elmo/elmo-flag.el
index 826cd7d..c7b6b1d 100644 (file)
--- a/elmo/elmo-flag.el
+++ b/elmo/elmo-flag.el
@@ -450,8 +450,12 @@ If optional IGNORE-PRESERVED is non-nil, preserved flags
            (append
             elmo-global-flags
             additional-flags
            (append
             elmo-global-flags
             additional-flags

-            (mapcar 'intern
-                    (delete ".." (delete "." (directory-files dir))))))))))
+            (and (file-directory-p dir)
+                 (mapcar 'intern
+                         (elmo-list-delete
+                          '(".." ".")
+                          (directory-files dir))))))
+          #'delq))))

 
 ;;; To migrate from global mark folder
 (defvar elmo-global-mark-filename "global-mark"
 
 ;;; To migrate from global mark folder
 (defvar elmo-global-mark-filename "global-mark"