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 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-16  Raphael Kubo da Costa  <kubito@gmail.com>  (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  <tzz@lifelogs.com>
 
        * 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 (file)
--- 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))
-  ;; 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."))
+(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.")))
 
 (autoload 'secrets-create-item "secrets")
 (autoload 'secrets-delete-item "secrets")