branch: externals/bbdb
commit 387bb5f216dd7c2d901af186b07d84f005c583c4
Author: Roland Winkler <wink...@gnu.org>
Commit: Roland Winkler <wink...@gnu.org>
Increase version number to 3.2.2a
---
NEWS | 15 +++++++++++++++
lisp/bbdb-mua.el | 12 +++++++++---
lisp/bbdb.el | 2 +-
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 4b95893737..e742315e96 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,21 @@ See the end of the file for license conditions.
This file is about changes in BBDB version 3.
+* BBDB 3.2.2a
+** Bug fixes
+
+** New user variables bbdb-message-ignore-mail-re,
+bbdb-message-ignore-name-re, and bbdb-record-address-alist-function
+
+** Yet experimental code for snarfing vCards.
+It may change in later versions of BBDB. See bbdb-snarf.el.
+
+** Changes to adapt BBDB to Emacs coding conventions
+bbdb-mua-interactive-action renamed from bbdb-mua-update-interactive-p.
+bbdb-mua-auto-action renamed from bbdb-mua-auto-update-p.
+bbdb-mua-action renamed from bbdb-update-records-p.
+
+
* BBDB 3.2.1
** Bug fixes
diff --git a/lisp/bbdb-mua.el b/lisp/bbdb-mua.el
index 81185393e7..50097360db 100644
--- a/lisp/bbdb-mua.el
+++ b/lisp/bbdb-mua.el
@@ -40,8 +40,13 @@
(eval-and-compile
(autoload 'gnus-fetch-original-field "gnus-utils")
(autoload 'gnus-summary-select-article "gnus-sum")
- (autoload 'gnus-info-params "gnus")
- (autoload 'gnus-get-info "gnus")
+ ;; `gnus-info-params' was a macro up to Emacs 26;
+ ;; it was turned into a function starting with Emacs 27.
+ ;; If BBDB was compiled with an old version of Emacs up to Emacs 26,
+ ;; this will fail if the code is loaded into a newer version of Emacs.
+ (autoload 'gnus-info-params "gnus"
+ nil nil (string> "27" emacs-version))
+ (autoload 'gnus-get-info "gnus" nil nil 'macro)
(defvar gnus-article-buffer)
(defvar gnus-newsgroup-name)
@@ -106,7 +111,8 @@ MIME encoded headers are decoded. Return nil if HEADER
does not exist."
;; of a header if we request the value of the same header multiple times.
;; (We would reset the remember table each time we move on to a new message.)
(let* ((mua (bbdb-mua))
- (val (cond (;; `gnus-fetch-field' can fetch only the content of
+ (val (cond ((eq mua 'gnus)
+ ;; `gnus-fetch-field' can fetch only the content of
;; `gnus-visible-headers', but it ignores
;; `gnus-ignored-headers'. `gnus-fetch-original-field'
;; uses the uncensored set of headers in
diff --git a/lisp/bbdb.el b/lisp/bbdb.el
index b7b562c88e..49895e0a13 100644
--- a/lisp/bbdb.el
+++ b/lisp/bbdb.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2010-2022 Free Software Foundation, Inc.
;; Maintainer: Roland Winkler <wink...@gnu.org>
-;; Version: 3.2.2
+;; Version: 3.2.2a
;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
;; This file is part of the Insidious Big Brother Database (aka BBDB),
