From b4c0925f4908a23d4c76b59f60cb73f7a47895a7 Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 23 Apr 2002 07:22:52 +0000 Subject: [PATCH] * gnus-bbdb.el (gnus-bbdb/update-record): Work around the incompatibility with BBDB 2.3x. --- lisp/gnus-bbdb.el | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lisp/gnus-bbdb.el b/lisp/gnus-bbdb.el index 9999498..281a1eb 100644 --- a/lisp/gnus-bbdb.el +++ b/lisp/gnus-bbdb.el @@ -81,13 +81,20 @@ the user confirms the creation." (when (setq sender (funcall gnus-bbdb/extract-message-sender-function)) (save-excursion - (bbdb-encache-message - message-key - (bbdb-annotate-message-sender sender t - (or (bbdb-invoke-hook-for-value - bbdb/news-auto-create-p) - offer-to-create) - offer-to-create)))))))) + (setq record (bbdb-annotate-message-sender + sender t + (or (bbdb-invoke-hook-for-value + bbdb/news-auto-create-p) + offer-to-create) + offer-to-create))) + ;; XXX: BBDB 2.3x not only redefines + ;; `bbdb-encache-message' as a macro but also the inherent + ;; semantics of message caching functions is changed, so + ;; the following calls are much the same here. + (if (functionp 'bbdb-encache-message) + (car (bbdb-encache-message message-key (list record))) + (bbdb-encache-message message-key record))))))) + ;;;###autoload (defun gnus-bbdb/annotate-sender (string &optional replace) -- 1.7.10.4