From fdb8fa4c3279cc03bbd13151cfb8f78362912baa Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 22 Oct 2002 02:09:19 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 7 ++++++- lisp/spam.el | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f1149f9..b3e9fc4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-10-22 Katsumi Yamaoka + + * spam.el: Set autoload for bbdb-records after loading bbdb-com to + prevent inf-loop. + 2002-10-22 Lars Magne Ingebrigtsen * nnslashdot.el: Removed some test lines. @@ -10,7 +15,7 @@ 2002-10-21 Lars Magne Ingebrigtsen - * mm-view.el (mm-text-html-renderer-alist): Add w3m-standalone. + * mm-view.el (mm-text-html-renderer-alist): Add w3m-standalone. (mm-text-html-washer-alist): Ditto. 2002-10-19 TSUCHIYA Masatoshi diff --git a/lisp/spam.el b/lisp/spam.el index 040b47e..0b03803 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -39,15 +39,16 @@ (require 'dns) (require 'message) -(eval-and-compile - (autoload 'bbdb-records "bbdb-com")) - ;; Attempt to load BBDB macros (eval-when-compile (condition-case nil (require 'bbdb-com) (file-error (defalias 'bbdb-search 'ignore)))) +;; This should be evaluated after loading bbdb-com to prevent inf-loop +(eval-and-compile + (autoload 'bbdb-records "bbdb-com")) + ;; autoload executable-find (eval-and-compile ;; executable-find is not autoloaded in Emacs 20 -- 1.7.10.4