[gnus git] branch master updated: n0-15-43-g3921b6b =1= Load ERT unconditionally anyway, discarding errors.

       via  3921b6be350597edd0d796deefc5174850da768f (commit)
      from  4b3eae16e6dfbed9198a27657860934a02b5b8b5 (commit)


- Log -----------------------------------------------------------------
commit 3921b6be350597edd0d796deefc5174850da768f
Author: Ted Zlatanov <[email protected]>
Date:   Wed Apr 6 09:59:14 2011 -0500

    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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,12 @@
 2011-04-06  Teodor Zlatanov  <[email protected]>
 
-	* 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
--- 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
--- 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

-----------------------------------------------------------------------
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        |    6 ++++--
 lisp/gnus-registry.el |    1 +
 lisp/registry.el      |    2 ++
 3 files changed, 7 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