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 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-06  David Engster  <dengste@eml.cc>
+
+       * 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  <dengste@eml.cc>
 
        * registry.el (initialize-instance): Change :after to :AFTER to be

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 02b98f0..5145f01 100644 (file)
--- 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 (file)
--- 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