From 45434b541d33215508dec3c13de9edcc529a99bb Mon Sep 17 00:00:00 2001 From: teranisi Date: Mon, 2 Apr 2001 07:36:14 +0000 Subject: [PATCH] * elmo.el: Moved obsolete variable definitions from elmo-imap4.el, elmo-nntp.el and elmo-pop3.el. * sb-asahi.el (shimbun-asahi-groups): Deleted "feneral" and "personal" groups. * wl.el (wl): Changed position of `elmo-init'. --- elmo/ChangeLog | 6 ++++++ elmo/elmo-imap4.el | 11 ----------- elmo/elmo-nntp.el | 7 ------- elmo/elmo-pop3.el | 9 --------- elmo/elmo-util.el | 3 ++- elmo/elmo.el | 26 ++++++++++++++++++++++++++ elmo/sb-asahi.el | 3 +-- wl/ChangeLog | 2 ++ wl/wl.el | 5 +++-- 9 files changed, 40 insertions(+), 32 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 1791304..0501cb2 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,11 @@ 2001-04-02 Yuuichi Teranishi + * elmo.el: Moved obsolete variable definitions from + elmo-imap4.el, elmo-nntp.el and elmo-pop3.el. + + * sb-asahi.el (shimbun-asahi-groups): Deleted "feneral" and "personal" + groups. + * shimbun.el: New file. * elmo-shimbun.el: New file. diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index de229cb..fe13a15 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -86,17 +86,6 @@ Any symbol value of `elmo-network-stream-type-alist' or :type 'symbol :group 'elmo) -(elmo-define-obsolete-variable 'elmo-default-imap4-mailbox - 'elmo-imap4-default-mailbox) -(elmo-define-obsolete-variable 'elmo-default-imap4-server - 'elmo-imap4-default-server) -(elmo-define-obsolete-variable 'elmo-default-imap4-authenticate-type - 'elmo-imap4-default-authenticate-type) -(elmo-define-obsolete-variable 'elmo-default-imap4-user - 'elmo-imap4-default-user) -(elmo-define-obsolete-variable 'elmo-default-imap4-port - 'elmo-imap4-default-port) - (defvar elmo-imap4-stream-type-alist nil "*Stream bindings for IMAP4. This is taken precedence over `elmo-network-stream-type-alist'.") diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el index 5beee54..b375ab7 100644 --- a/elmo/elmo-nntp.el +++ b/elmo/elmo-nntp.el @@ -64,13 +64,6 @@ Any symbol value of `elmo-network-stream-type-alist' or :type 'symbol :group 'elmo) -(elmo-define-obsolete-variable 'elmo-default-nntp-server - 'elmo-nntp-default-server) -(elmo-define-obsolete-variable 'elmo-default-nntp-user - 'elmo-nntp-default-user) -(elmo-define-obsolete-variable 'elmo-default-nntp-port - 'elmo-nntp-default-port) - (defvar elmo-nntp-stream-type-alist nil "*Stream bindings for NNTP. This is taken precedence over `elmo-network-stream-type-alist'.") diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index 7b29818..7a415bf 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -75,15 +75,6 @@ Any symbol value of `elmo-network-stream-type-alist' or :type 'boolean :group 'elmo) -(elmo-define-obsolete-variable 'elmo-default-pop3-server - 'elmo-pop3-default-server) -(elmo-define-obsolete-variable 'elmo-default-pop3-user - 'elmo-pop3-default-user) -(elmo-define-obsolete-variable 'elmo-default-pop3-authenticate-type - 'elmo-pop3-default-authenticate-type) -(elmo-define-obsolete-variable 'elmo-default-pop3-port - 'elmo-pop3-default-port) - (defvar elmo-pop3-stream-type-alist nil "*Stream bindings for POP3. This is taken precedence over `elmo-network-stream-type-alist'.") diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el index 827336d..7039abb 100644 --- a/elmo/elmo-util.el +++ b/elmo/elmo-util.el @@ -1684,7 +1684,8 @@ Definition is stored in `elmo-obsolete-variable-alist'." "Resque obsolete variable OBSOLETE as VAR. If `elmo-obsolete-variable-show-warnings' is non-nil, show warning message." (when (boundp obsolete) - (static-if (fboundp 'defvaralias) + (static-if (and (fboundp 'defvaralias) + (subrp (symbol-function 'defvaralias))) (defvaralias obsolete var) (set var (symbol-value obsolete))) (if elmo-obsolete-variable-show-warnings diff --git a/elmo/elmo.el b/elmo/elmo.el index 1ef0b39..a430940 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -1300,6 +1300,32 @@ Return a hashtable for newsgroups." (elmo-define-folder ?[ 'nmz) (elmo-define-folder ?@ 'shimbun) +;;; Obsolete variables. +(elmo-define-obsolete-variable 'elmo-default-imap4-mailbox + 'elmo-imap4-default-mailbox) +(elmo-define-obsolete-variable 'elmo-default-imap4-server + 'elmo-imap4-default-server) +(elmo-define-obsolete-variable 'elmo-default-imap4-authenticate-type + 'elmo-imap4-default-authenticate-type) +(elmo-define-obsolete-variable 'elmo-default-imap4-user + 'elmo-imap4-default-user) +(elmo-define-obsolete-variable 'elmo-default-imap4-port + 'elmo-imap4-default-port) +(elmo-define-obsolete-variable 'elmo-default-nntp-server + 'elmo-nntp-default-server) +(elmo-define-obsolete-variable 'elmo-default-nntp-user + 'elmo-nntp-default-user) +(elmo-define-obsolete-variable 'elmo-default-nntp-port + 'elmo-nntp-default-port) +(elmo-define-obsolete-variable 'elmo-default-pop3-server + 'elmo-pop3-default-server) +(elmo-define-obsolete-variable 'elmo-default-pop3-user + 'elmo-pop3-default-user) +(elmo-define-obsolete-variable 'elmo-default-pop3-authenticate-type + 'elmo-pop3-default-authenticate-type) +(elmo-define-obsolete-variable 'elmo-default-pop3-port + 'elmo-pop3-default-port) + (require 'product) (product-provide (provide 'elmo) (require 'elmo-version)) diff --git a/elmo/sb-asahi.el b/elmo/sb-asahi.el index 3214fbd..3c390b3 100644 --- a/elmo/sb-asahi.el +++ b/elmo/sb-asahi.el @@ -36,8 +36,7 @@ (defvar shimbun-asahi-url "http://spin.asahi.com/") (defvar shimbun-asahi-groups '("national" "business" "politics" - "international" "sports" "personal" - "feneral")) + "international" "sports")) (defvar shimbun-asahi-coding-system (static-if (boundp 'MULE) '*sjis* 'shift_jis)) (defvar shimbun-asahi-from-address "webmaster@www.asahi.com") diff --git a/wl/ChangeLog b/wl/ChangeLog index 502c339..c361321 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,7 @@ 2001-04-02 Yuuichi Teranishi + * wl.el (wl): Changed position of `elmo-init'. + * wl-draft.el (wl-default-draft-cite): Use date field on the citation buffer. diff --git a/wl/wl.el b/wl/wl.el index 003f025..a0ac37e 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -750,7 +750,9 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." "Start Wanderlust -- Yet Another Message Interface On Emacsen. If ARG (prefix argument) is specified, folder checkings are skipped." (interactive "P") - (or wl-init (wl-load-profile)) + (unless wl-init + (wl-load-profile)) + (elmo-init) (let (demo-buf) (setq demo-buf (wl-demo)) (wl-init) @@ -764,7 +766,6 @@ If ARG (prefix argument) is specified, folder checkings are skipped." (condition-case obj (progn (wl-plugged-init (wl-folder arg)) - (elmo-init) (unless arg (run-hooks 'wl-auto-check-folder-pre-hook) (wl-folder-auto-check) -- 1.7.10.4