[gnus git] branch master updated: m0-5-268-g6881918 =1= * gnus-registry.el (gnus-registry-save): Provide class name when calling `eieio-persistent-read' to avoid "unsafe call" warning. Use `condition-case' to stay compatible with older EIEIO versions which only accept one argument.
David Engster <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 68819187129126e5cfb9aa0cf0249f98cddc375c (commit)
from b53d52ca26581bc70fa02da4bc243678e4a44daa (commit)
- Log -----------------------------------------------------------------
commit 68819187129126e5cfb9aa0cf0249f98cddc375c
Author: David Engster <[email protected]>
Date: Fri Feb 22 21:25:09 2013 +0100
* gnus-registry.el (gnus-registry-save): Provide class name when
calling `eieio-persistent-read' to avoid "unsafe call" warning. Use
`condition-case' to stay compatible with older EIEIO versions which
only accept one argument.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85371d7..57b9c89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-22 David Engster <[email protected]>
+
+ * gnus-registry.el (gnus-registry-save): Provide class name when
+ calling `eieio-persistent-read' to avoid "unsafe call" warning. Use
+ `condition-case' to stay compatible with older EIEIO versions which
+ only accept one argument.
+
2013-02-17 Daiki Ueno <[email protected]>
* mml2015.el (epg-key-user-id-list, epg-user-id-string)
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index e808b19..829734f 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -296,8 +296,13 @@ This is not required after changing `gnus-registry-cache-file'."
(condition-case nil
(progn
(gnus-message 5 "Reading Gnus registry from %s..." file)
- (setq gnus-registry-db (gnus-registry-fixup-registry
- (eieio-persistent-read file)))
+ (setq gnus-registry-db
+ (gnus-registry-fixup-registry
+ (condition-case nil
+ (eieio-persistent-read file 'registry-db)
+ ;; Older EIEIO versions do not check the class name.
+ ('wrong-number-of-arguments
+ (eieio-persistent-read file)))))
(gnus-message 5 "Reading Gnus registry from %s...done" file))
(error
(gnus-message
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 7 +++++++
lisp/gnus-registry.el | 9 +++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project