[gnus git] branch master updated: =1= Use eval-and-compile to load EIEIO correctly.

Ted Zlatanov <[email protected]>
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  08e999e964705dbee29b164e4af4671688529824 (commit)
      from  4a0aa924f116ad60fe60d572063ac9ed9fd80e50 (commit)


- Log -----------------------------------------------------------------
commit 08e999e964705dbee29b164e4af4671688529824
Author: Raphael Kubo da Costa <[email protected]>
Date:   Wed Feb 16 21:19:30 2011 -0600

    Use eval-and-compile to load EIEIO correctly.
    
    * auth-source.el: Correctly load EIEIO from "gnus-fallback-lib/eieio"
    as EIEIO must also be loaded when auth-source.el is being
    byte-compiled.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61538e2..c0a5e89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-16  Raphael Kubo da Costa  <[email protected]>  (tiny change)
+
+	* auth-source.el: Correctly load EIEIO from "gnus-fallback-lib/eieio"
+	as EIEIO must also be loaded when auth-source.el is being
+	byte-compiled.
+
 2011-02-16  Teodor Zlatanov  <[email protected]>
 
 	* gnus-fallback-lib/eieio/eieio.el: Copy from Emacs.
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index abcc85b..3841e58 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -44,12 +44,12 @@
 (require 'netrc)
 (require 'assoc)
 (eval-when-compile (require 'cl))
-(ignore-errors
-  (or (require 'eieio))
+(eval-and-compile
+  (or (require 'eieio nil t)
   ;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib
   (load "gnus-fallback-lib/eieio/eieio"))
-(unless (featurep 'eieio)
-  (error "eieio not found in `load-path' or gnus-fallback-lib/ directory."))
+  (unless (featurep 'eieio)
+    (error "eieio not found in `load-path' or gnus-fallback-lib/ directory.")))
 
 (autoload 'secrets-create-item "secrets")
 (autoload 'secrets-delete-item "secrets")

-----------------------------------------------------------------------
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      |    6 ++++++
 lisp/auth-source.el |   12 ++++++------
 2 files changed, 12 insertions(+), 6 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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.