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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36e5b8b..c6566df 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,12 @@
 2011-04-06  Teodor Zlatanov  <tzz@lifelogs.com>
 
-       * 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 511012d..6c660b1 100644 (file)
--- 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 cc03b20..edaa4f5 100644 (file)
--- 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