[gnus git] branch master updated: n0-15-47-g558e0e0 =1= XEmacs 21.4 does not support third argument NOERROR for `require'.

       via  558e0e07ed1151d12ca7a8c63e50b0cc7acbeb0a (commit)
      from  c66eb73ceb9010e8b9bd02b6d61fc6e2079fa04e (commit)


- Log -----------------------------------------------------------------
commit 558e0e07ed1151d12ca7a8c63e50b0cc7acbeb0a
Author: David Engster <[email protected]>
Date:   Wed Apr 6 22:19:36 2011 +0200

    XEmacs 21.4 does not support third argument NOERROR for `require'.
    
    * registry.el, gnus-registry.el: Use `ignore-errors' instead of third
    argument NOERROR for `require', since XEmacs 21.4 does not support it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06ec3b1..5d4a8ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2011-04-06  David Engster  <[email protected]>
 
+	* registry.el, gnus-registry.el: Use `ignore-errors' instead of third
+	argument NOERROR for `require', since XEmacs 21.4 does not support it.
+
+2011-04-06  David Engster  <[email protected]>
+
 	* registry.el (initialize-instance): Change :after to :AFTER to be
 	compatible with old EIEIO version in XEmacs.
 
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 02b98f0..5145f01 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -58,10 +58,11 @@
 (eval-when-compile (require 'cl))
 
 (eval-when-compile
-  (when (null (require 'ert nil t))
+  (when (null (ignore-errors (require 'ert)))
     (defmacro* ert-deftest (name () &body docstring-keys-and-body))))
 
-(require 'ert nil t)
+(ignore-errors
+  (require 'ert))
 (require 'gnus)
 (require 'gnus-int)
 (require 'gnus-sum)
diff --git a/lisp/registry.el b/lisp/registry.el
index f390c28..8fb7aab 100644
--- a/lisp/registry.el
+++ b/lisp/registry.el
@@ -78,10 +78,11 @@
 ;;; Code:
 
 (eval-when-compile
-  (when (null (require 'ert nil t))
+  (when (null (ignore-errors (require 'ert)))
     (defmacro* ert-deftest (name () &body docstring-keys-and-body))))
 
-(require 'ert nil t)
+(ignore-errors
+  (require 'ert))
 
 (eval-when-compile (require 'cl))
 (eval-and-compile

-----------------------------------------------------------------------
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        |    5 +++++
 lisp/gnus-registry.el |    5 +++--
 lisp/registry.el      |    5 +++--
 3 files changed, 11 insertions(+), 4 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