[gnus git] branch master updated: =1= auth-source.el: Bind load-path when loading EIEIO from "gnus-fallback-lib/eieio".
Katsumi Yamaoka <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 594f190f2906dc2f414d7b4ca4db566627d58555 (commit)
from 08e999e964705dbee29b164e4af4671688529824 (commit)
- Log -----------------------------------------------------------------
commit 594f190f2906dc2f414d7b4ca4db566627d58555
Author: Katsumi Yamaoka <[email protected]>
Date: Thu Feb 17 03:55:30 2011 +0000
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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-17 Katsumi Yamaoka <[email protected]>
+
+ * auth-source.el: Bind load-path when loading EIEIO from
+ "gnus-fallback-lib/eieio".
+
2011-02-16 Raphael Kubo da Costa <[email protected]> (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
--- 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")
-----------------------------------------------------------------------
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 | 5 +++++
lisp/auth-source.el | 10 +++++++---
2 files changed, 12 insertions(+), 3 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