(elmo-maildir-list-location): Fixed a regular

expression.
(elmo-maildir-set-mark): Ditto.
(elmo-maildir-delete-mark): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 420e57b..8137d72 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-13  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-maildir.el (elmo-maildir-list-location): Fixed a regular
+       expression.
+       (elmo-maildir-set-mark): Ditto.
+       (elmo-maildir-delete-mark): Ditto.
+
 2006-03-13  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-util.el (elmo-collect-separators-internal): Add 2nd

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 9632959..ef62c3c 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -112,6 +112,7 @@ LOCATION."
   (let* ((cur-dir (expand-file-name (or child-dir "cur") dir))
         (cur (directory-files cur-dir
                               nil "^[^.].*$" t))
+        (regexp (elmo-maildir-adjust-separator "^\\(.+\\):[12],\\(.*\\)$"))
         unread-locations flagged-locations answered-locations
         sym locations flag-list x-time y-time)
     (setq cur (sort cur
@@ -129,9 +130,7 @@ LOCATION."
     (setq locations
          (mapcar
           (lambda (x)
-            (if (string-match
-                 (elmo-maildir-adjust-separator "^\\([^:]+\\):\\([^:]+\\)$")
-                 x)
+            (if (string-match regexp x)
                 (progn
                   (setq sym (elmo-match-string 1 x)
                         flag-list (string-to-char-list
@@ -300,7 +299,7 @@ LOCATION."
 (defun elmo-maildir-set-mark (filename mark)
   "Mark the FILENAME file in the maildir.  MARK is a character."
   (if (string-match
-       (elmo-maildir-adjust-separator "^\\([^:]+:[12],\\)\\(.*\\)$")
+       (elmo-maildir-adjust-separator "^\\(.+:[12],\\)\\(.*\\)$")
        filename)
       (let ((flaglist (string-to-char-list (elmo-match-string
                                            2 filename))))
@@ -318,7 +317,7 @@ LOCATION."
 
 (defun elmo-maildir-delete-mark (filename mark)
   "Mark the FILENAME file in the maildir.  MARK is a character."
-  (if (string-match (elmo-maildir-adjust-separator "^\\([^:]+:2,\\)\\(.*\\)$")
+  (if (string-match (elmo-maildir-adjust-separator "^\\(.+:2,\\)\\(.*\\)$")
                    filename)
       (let ((flaglist (string-to-char-list (elmo-match-string
                                            2 filename))))