From 32ac1acbf55fe280df031e13eb8f551234d442dc Mon Sep 17 00:00:00 2001 From: teranisi Date: Sun, 5 Sep 2004 04:17:59 +0000 Subject: [PATCH] * elmo.el (elmo-make-folder): Remove text properties for prefix. * elmo-flag.el (elmo-folder-list-subfolders): Fetch flag names from msgdb. --- elmo/ChangeLog | 7 +++++++ elmo/elmo-flag.el | 18 +++++++++++------- elmo/elmo.el | 4 ++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 872d571..89087a8 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,10 @@ +2004-09-05 Yuuichi Teranishi + + * elmo.el (elmo-make-folder): Remove text properties for prefix. + + * elmo-flag.el (elmo-folder-list-subfolders): Fetch flag names + from msgdb. + 2004-08-31 Hiroya Murata * elmo-multi.el (elmo-folder-count-flags): Changed return value diff --git a/elmo/elmo-flag.el b/elmo/elmo-flag.el index f667d17..13c71f2 100644 --- a/elmo/elmo-flag.el +++ b/elmo/elmo-flag.el @@ -105,13 +105,17 @@ (luna-define-method elmo-folder-list-subfolders ((folder elmo-flag-folder) &optional one-level) - (mapcar (lambda (flag) - (concat - (elmo-folder-prefix-internal folder) - (symbol-name (elmo-folder-type-internal folder)) - "/" - (symbol-name flag))) - elmo-global-flag-list)) + (let ((dir (expand-file-name "flag" elmo-msgdb-directory))) + (mapcar (lambda (flag) + (concat + (elmo-folder-prefix-internal folder) + (symbol-name (elmo-folder-type-internal folder)) + "/" + (symbol-name flag))) + (elmo-uniq-list + (append + (mapcar 'intern (delete ".." (delete "." (directory-files dir)))) + elmo-global-flag-list))))) (defun elmo-flag-folder-delete-message (folder number &optional keep-referrer) diff --git a/elmo/elmo.el b/elmo/elmo.el index 87b0b4c..1851371 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -142,8 +142,8 @@ If optional argument NON-PERSISTENT is non-nil, the folder msgdb is not saved." (setq original (elmo-string name)) (if type (progn - (setq prefix (substring name 0 1)) - (setq name (substring name 1))) + (setq prefix (elmo-string (substring name 0 1))) + (setq name (elmo-string (substring name 1)))) (setq type (intern (car (setq split (split-string name ":"))))) (if (>= (length split) 2) (setq name (substring name (+ 1 (length (car split))))) -- 1.7.10.4