From 6e3c9e28af120560824ec195bac68581a4f8f077 Mon Sep 17 00:00:00 2001 From: teranisi Date: Fri, 7 Nov 2003 00:46:13 +0000 Subject: [PATCH] * elmo.el (toplevel): Remove setting of autoloding for elmo-global-flag-initialize. (elmo-init): Don't call elmo-global-flag-initialize. * elmo-flag.el (elmo-global-flag-initialize): Abolish. (elmo-global-mark-migrate): Don't call it. (elmo-global-mark-upgrade): Ditto. --- elmo/ChangeLog | 10 ++++++++++ elmo/elmo-flag.el | 12 ------------ elmo/elmo.el | 2 -- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 722e7b6..0bd0035 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,13 @@ +2003-11-07 Yuuichi Teranishi + + * elmo.el (toplevel): Remove setting of autoloding for + elmo-global-flag-initialize. + (elmo-init): Don't call elmo-global-flag-initialize. + + * elmo-flag.el (elmo-global-flag-initialize): Abolish. + (elmo-global-mark-migrate): Don't call it. + (elmo-global-mark-upgrade): Ditto. + 2003-11-06 Yuuichi Teranishi * elmo-internal.el (elmo-internal-obsolete-folder-list): New variable. diff --git a/elmo/elmo-flag.el b/elmo/elmo-flag.el index c1bb436..895c99e 100644 --- a/elmo/elmo-flag.el +++ b/elmo/elmo-flag.el @@ -196,16 +196,6 @@ NUMBER is the number of the message." folder))))) ;;; Global-Flag API -(defun elmo-global-flag-initialize () - "Initialize flag folders. -This function is necessary to be called before using `elmo-flag-folder'." - (unless elmo-global-flag-folder-alist - (dolist (flag elmo-global-flag-list) - (setq elmo-global-flag-folder-alist - (cons (elmo-make-folder - (concat "'flag/" (symbol-name flag))) - elmo-global-flag-folder-alist))))) - (defun elmo-global-flag-p (flag) "Return non-nil when FLAG is global." (memq flag elmo-global-flag-list)) @@ -374,7 +364,6 @@ the message is not flagged in any folder." (defun elmo-global-mark-migrate () "Migrate from 'mark to 'flag. For automatic migration." - (elmo-global-flag-initialize) (when (and (file-exists-p (expand-file-name elmo-global-mark-filename elmo-msgdb-directory)) (elmo-global-flag-p 'important) @@ -388,7 +377,6 @@ the message is not flagged in any folder." (when (file-exists-p (expand-file-name elmo-global-mark-filename elmo-msgdb-directory)) (message "Upgrading flag structure...") - (elmo-global-flag-initialize) (when (elmo-global-flag-p 'important) (let ((global-marks (elmo-object-load diff --git a/elmo/elmo.el b/elmo/elmo.el index 70d1cc9..213eeff 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -83,7 +83,6 @@ Otherwise, entire fetching of the message is aborted without confirmation." (eval-and-compile (autoload 'elmo-dop-queue-flush "elmo-dop") (autoload 'elmo-nntp-post "elmo-nntp") - (autoload 'elmo-global-flag-initialize "elmo-flag") (autoload 'elmo-global-flag-p "elmo-flag") (autoload 'elmo-global-flag-detach "elmo-flag") (autoload 'elmo-global-flag-detach-messages "elmo-flag") @@ -1596,7 +1595,6 @@ Return a hashtable for newsgroups." "Initialize ELMO module." (elmo-crosspost-message-alist-load) (elmo-resque-obsolete-variables) - (elmo-global-flag-initialize) (elmo-dop-queue-load) (run-hooks 'elmo-init-hook)) -- 1.7.10.4