auth-source.el: Bind load-path when loading EIEIO from "gnus-fallback-lib/eieio".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0a5e89..62fc848 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * auth-source.el: Bind load-path when loading EIEIO from
+       "gnus-fallback-lib/eieio".
+
 2011-02-16  Raphael Kubo da Costa  <kubito@gmail.com>  (tiny change)
 
        * auth-source.el: Correctly load EIEIO from "gnus-fallback-lib/eieio"

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 3841e58..94ebe52 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -47,9 +47,13 @@
 (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.")))
+      (let ((load-path (cons (expand-file-name
+                             "gnus-fallback-lib/eieio"
+                             (file-name-directory (locate-library "gnus")))
+                            load-path)))
+       (require 'eieio nil t))
+      (error
+       "eieio not found in `load-path' or gnus-fallback-lib/ directory.")))
 
 (autoload 'secrets-create-item "secrets")
 (autoload 'secrets-delete-item "secrets")