auth-source.el: Don't pass more than two args, that XEmacs 21.4 doesn't support,...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62fc848..aedc2a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,8 @@
 2011-02-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * auth-source.el: Bind load-path when loading EIEIO from
-       "gnus-fallback-lib/eieio".
+       "gnus-fallback-lib/eieio"; don't pass more than two args, that XEmacs
+       21.4 doesn't support, to `require'.
 
 2011-02-16  Raphael Kubo da Costa  <kubito@gmail.com>  (tiny change)
 

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 94ebe52..b5cc55f 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -45,13 +45,14 @@
 (require 'assoc)
 (eval-when-compile (require 'cl))
 (eval-and-compile
-  (or (require 'eieio nil t)
+  (or (ignore-errors (require 'eieio))
       ;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib
-      (let ((load-path (cons (expand-file-name
-                             "gnus-fallback-lib/eieio"
-                             (file-name-directory (locate-library "gnus")))
-                            load-path)))
-       (require 'eieio nil t))
+      (ignore-errors
+       (let ((load-path (cons (expand-file-name
+                               "gnus-fallback-lib/eieio"
+                               (file-name-directory (locate-library "gnus")))
+                              load-path)))
+         (require 'eieio)))
       (error
        "eieio not found in `load-path' or gnus-fallback-lib/ directory.")))