[gnus git] branch master updated: =1= auth-source.el: Don't pass more than two args, that XEmacs 21.4 doesn't support, to `require'.

       via  5625d4e1ca8529725b2167983e04a23df421eeed (commit)
      from  594f190f2906dc2f414d7b4ca4db566627d58555 (commit)


- Log -----------------------------------------------------------------
commit 5625d4e1ca8529725b2167983e04a23df421eeed
Author: Katsumi Yamaoka <[email protected]>
Date:   Thu Feb 17 04:07:41 2011 +0000

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62fc848..aedc2a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,8 @@
 2011-02-17  Katsumi Yamaoka  <[email protected]>
 
 	* 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  <[email protected]>  (tiny change)
 
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 94ebe52..b5cc55f 100644
--- 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
+      (ignore-errors
       (let ((load-path (cons (expand-file-name
 			      "gnus-fallback-lib/eieio"
 			      (file-name-directory (locate-library "gnus")))
 			     load-path)))
-	(require 'eieio nil t))
+	  (require 'eieio)))
       (error
        "eieio not found in `load-path' or gnus-fallback-lib/ directory.")))
 

-----------------------------------------------------------------------
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      |    3 ++-
 lisp/auth-source.el |   13 +++++++------
 2 files changed, 9 insertions(+), 7 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