* spam.el: removed unnecessary condition-case for loading bbdb-com.el

* lpath.el (bbdb-search): added BBDB functions for a better way to
fix missing functions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f91ee4..6701ac3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-07  Teodor Zlatanov  <tzz@beld.net>
+
+       * spam.el: removed unnecessary condition-case for loading bbdb-com.el
+
+       * lpath.el (bbdb-search): added BBDB functions for a better way to
+       fix missing functions
+
 2003-01-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el: define 'ignore alias for spam-BBDB-register-routine,

diff --git a/lisp/lpath.el b/lisp/lpath.el
index f679d38..77ac3a6 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -9,12 +9,14 @@
 (defun maybe-bind (args)
   (mapcar (lambda (var) (unless (boundp var) (set var nil))) args))
 
-(maybe-fbind '(create-image display-graphic-p
+(maybe-fbind '(bbdb-search bbdb-create-internal
+              create-image display-graphic-p
               display-time-event-handler find-image image-size
               image-type-available-p insert-image
               make-mode-line-mouse-map make-temp-file propertize
               put-image replace-regexp-in-string rmail-msg-is-pruned
               rmail-msg-restore-non-pruned-header sort-coding-systems
+              spam-BBDB-register-routine spam-enter-ham-BBDB
               tool-bar-add-item tool-bar-add-item-from-menu
               tool-bar-local-item-from-menu url-http-file-exists-p
               vcard-pretty-print w32-focus-frame

diff --git a/lisp/spam.el b/lisp/spam.el
index bbfe71a..8993f08 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -40,16 +40,6 @@
 (require 'gnus)        ; for the definitions of group content classification and spam processors
 (require 'message)                     ;for the message-fetch-field functions
 
-;; Attempt to load BBDB macros
-(eval-when-compile
-  (condition-case nil
-      (require 'bbdb-com)
-    (file-error 
-     (defalias 'spam-BBDB-register-routine 'ignore)
-     (defalias 'spam-enter-ham-BBDB 'ignore)
-     (defalias 'bbdb-search 'ignore)
-     (defalias 'bbdb-create-internal 'ignore))))
-
 ;; autoload executable-find
 (eval-and-compile
   ;; executable-find is not autoloaded in Emacs 20