* gnus-bbdb.el (gnus-bbdb/pop-up-bbdb-buffer): Use `bbdb-display-layout'

 or `bbdb-pop-up-display-layout' instead of `bbdb-elided-display' or
 `bbdb-pop-up-elided-display' when BBDB v2.33 or later is running.

diff --git a/ChangeLog b/ChangeLog
index 02e60db..639cd45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/gnus-bbdb.el (gnus-bbdb/pop-up-bbdb-buffer): Use
+       `bbdb-display-layout' or `bbdb-pop-up-display-layout' instead of
+       `bbdb-elided-display' or `bbdb-pop-up-elided-display' when BBDB
+       v2.33 or later is running.
+
 2001-08-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-util.el (gnus-truncate-string): Abolished.

diff --git a/lisp/gnus-bbdb.el b/lisp/gnus-bbdb.el
index dd14068..2388b3c 100644 (file)
--- a/lisp/gnus-bbdb.el
+++ b/lisp/gnus-bbdb.el
@@ -114,7 +114,12 @@ displaying the record corresponding to the sender of the current message."
         (record
          (let (bbdb-use-pop-up)
            (gnus-bbdb/update-record offer-to-create)))
-        (bbdb-elided-display (bbdb-pop-up-elided-display)))
+        (bbdb-display-layout
+         (cond ((boundp 'bbdb-pop-up-display-layout)
+                (symbol-value 'bbdb-pop-up-display-layout))
+               ((boundp 'bbdb-pop-up-elided-display)
+                (symbol-value 'bbdb-pop-up-elided-display))))
+        (bbdb-elided-display bbdb-display-layout))
     (save-current-buffer
       ;; display the bbdb buffer iff there is a record for this article.
       (cond