From 3921b6be350597edd0d796deefc5174850da768f Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Wed, 6 Apr 2011 09:59:14 -0500 Subject: [PATCH] Load ERT unconditionally anyway, discarding errors. * registry.el: Don't use ERT if it's not available. Load it unconditionally anyway, discarding errors. * gnus-registry.el: Don't use ERT if it's not available. Load it unconditionally anyway, discarding errors. --- lisp/ChangeLog | 6 ++++-- lisp/gnus-registry.el | 1 + lisp/registry.el | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 36e5b8bf5..c6566df01 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,12 @@ 2011-04-06 Teodor Zlatanov - * gnus-registry.el: Don't use ERT if it's not available. + * gnus-registry.el: Don't use ERT if it's not available. Load it + unconditionally anyway, discarding errors. (gnus-registry-delete-entries): New convenience function. (gnus-registry-import-eld): Import from old .eld registry. - * registry.el: Don't use ERT if it's not available. + * registry.el: Don't use ERT if it's not available. Load it + unconditionally anyway, discarding errors. * proto-stream.el (gnutls-negotiate): Revert inadvertent commit of the version from the Claudio Bley GnuTLS patch (extra optional parameters diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index 511012df5..6c660b164 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -61,6 +61,7 @@ (when (null (require 'ert nil t)) (defmacro* ert-deftest (name () &body docstring-keys-and-body)))) +(require 'ert nil t) (require 'gnus) (require 'gnus-int) (require 'gnus-sum) diff --git a/lisp/registry.el b/lisp/registry.el index cc03b2066..edaa4f54f 100644 --- a/lisp/registry.el +++ b/lisp/registry.el @@ -81,6 +81,8 @@ (when (null (require 'ert nil t)) (defmacro* ert-deftest (name () &body docstring-keys-and-body)))) +(require 'ert nil t) + (eval-when-compile (require 'cl)) (eval-and-compile (or (ignore-errors (progn -- 2.34.1