* bbdb-wl.el (bbdb-wl-setup): Include defvars for bbdb-get-addresses-headers.

* elmo.el (elmo-default-imap4-stream-type): Define as obsolete variable.
(elmo-default-nntp-stream-type): Ditto.
(elmo-default-pop3-stream-type): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index b94e89d..33bf2cb 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-28  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo.el (elmo-default-imap4-stream-type): Define as obsolete
+       variable.
+       (elmo-default-nntp-stream-type): Ditto.
+       (elmo-default-pop3-stream-type): Ditto.
+
 2002-01-25  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
 
        * elmo.el (elmo-generic-folder-append-messages): Disable multibyte.

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 8da60b2..b2a437c 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1530,12 +1530,16 @@ Return a hashtable for newsgroups."
                               'elmo-imap4-default-user)
 (elmo-define-obsolete-variable 'elmo-default-imap4-port
                               'elmo-imap4-default-port)
+(elmo-define-obsolete-variable 'elmo-default-imap4-stream-type
+                              'elmo-imap4-default-stream-type)
 (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-nntp-stream-type
+                              'elmo-nntp-default-stream-type)
 (elmo-define-obsolete-variable 'elmo-default-pop3-server
                               'elmo-pop3-default-server)
 (elmo-define-obsolete-variable 'elmo-default-pop3-user
@@ -1544,6 +1548,8 @@ Return a hashtable for newsgroups."
                               'elmo-pop3-default-authenticate-type)
 (elmo-define-obsolete-variable 'elmo-default-pop3-port
                               'elmo-pop3-default-port)
+(elmo-define-obsolete-variable 'elmo-default-pop3-stream-type
+                              'elmo-pop3-default-stream-type)
 (elmo-define-obsolete-variable 'elmo-cache-dirname
                               'elmo-cache-directory)
 (elmo-define-obsolete-variable 'elmo-msgdb-dir

diff --git a/utils/ChangeLog b/utils/ChangeLog
index ced6362..0f3be4a 100644 (file)
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -7,6 +7,7 @@
        (bbdb-wl-address-headers-spec): New function.
        (bbdb-wl-show-all-recipients): Use it.
        (bbdb-wl-show-sender): Ditto.
+       (bbdb-wl-setup): Include defvars for bbdb-get-addresses-headers.
 
 2002-01-17  Kenichi OKADA  <okada@opaopa.org>
 

diff --git a/utils/bbdb-wl.el b/utils/bbdb-wl.el
index 9871335..10a73e0 100644 (file)
--- a/utils/bbdb-wl.el
+++ b/utils/bbdb-wl.el
@@ -62,7 +62,20 @@
   (when (and (not (featurep 'bbdb-autoloads))
             (module-installed-p 'bbdb-autoloads))
     ;; BBDB 2.20: bbdb-autoloads.el NOT includes (provide 'bbdb-autoloads)
-    (load "bbdb-autoloads")))
+    (load "bbdb-autoloads"))
+  
+  (if (not (boundp 'bbdb-get-addresses-from-headers))
+      (defvar bbdb-get-addresses-from-headers
+       '("From" "Resent-From" "Reply-To")))
+
+  (if (not (boundp 'bbdb-get-addresses-to-headers))
+      (defvar bbdb-get-addresses-to-headers
+       '("Resent-To" "Resent-CC" "To" "CC" "BCC")))
+
+  (if (not (boundp 'bbdb-get-addresses-headers))
+      (defvar bbdb-get-addresses-headers
+       (append bbdb-get-addresses-from-headers
+               bbdb-get-addresses-to-headers))))
 
 (defun bbdb-wl-exit ()
   (let (bbdb-buf)
@@ -141,18 +154,6 @@
          from-str)
       string)))
 
-(if (not (boundp 'bbdb-get-addresses-from-headers))
-    (defvar bbdb-get-addresses-from-headers
-      '("From" "Resent-From" "Reply-To")))
-
-(if (not (boundp 'bbdb-get-addresses-to-headers))
-    (defvar bbdb-get-addresses-to-headers
-      '("Resent-To" "Resent-CC" "To" "CC" "BCC")))
-
-(if (not (boundp 'bbdb-get-addresses-headers))
-    (defvar bbdb-get-addresses-headers
-      (append bbdb-get-addresses-from-headers bbdb-get-addresses-to-headers)))
-
 (defun bbdb-wl-get-addresses-1 (&optional only-first-address)
   "Return real name and email address of sender respectively recipients.
 If an address matches `bbdb-user-mail-names' it will be ignored.