dgnushack.el: Don't use ignore-errors in the top level form since it is unavailable...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f031b4f..403740c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * dgnushack.el: Don't use ignore-errors in the top level form since it
+       is unavailable in XEmacs even if cl is loaded.
+
        * gnus-art.el (org-entities): Bind it.
 
 2010-11-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index a7f804a..0a76b59 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -35,8 +35,9 @@
 (require 'cl)
 (require 'iswitchb)
 
-(ignore-errors
-  (require 'org-entities))
+(condition-case nil
+    (require 'org-entities)
+  (error nil))
 
 (defvar srcdir (or (getenv "srcdir") "."))
 (defvar loaddir (and load-file-name (file-name-directory load-file-name)))