[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Fix error introduced in patch-83
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Fix error introduced in patch-83 |
Date: |
Sun, 14 Oct 2007 00:48:40 -0400 |
commit adce545ae26bc4edc37a5097418918591508219c
Author: Michael Olson <address@hidden>
Date: Thu Jan 11 01:33:14 2007 +0000
Fix error introduced in patch-83
* erc-services.el (erc-nickserv-identify-mode): Fix recursive load error.
git-archimport-id: address@hidden/erc--main--0--patch-85
diff --git a/ChangeLog b/ChangeLog
index 0ca3bd1..8a48196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@
* erc-services.el (erc-nickserv-identify-mode): Improve
documentation for nick-change option and move higher to fix
- compiler warning.
+ compiler warning. Avoid a recursive load error.
(erc-nickserv-alist): Add simple entry for BitlBee, to avoid
"NickServ is AWAY: User is offline" error. Oddly enough, bitlbee
was smart enough to recognize that as an authentication request
diff --git a/erc-services.el b/erc-services.el
index 63ee77c..ce505f5 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -96,7 +96,9 @@ You can also use M-x erc-nickserv-identify-mode to change
modes."
(const nil))
:set (lambda (sym val)
(set sym val)
- (erc-nickserv-identify-mode val)))
+ ;; avoid recursive load at startup
+ (when (featurep 'erc-services)
+ (erc-nickserv-identify-mode val))))
;;;###autoload (autoload 'erc-services-mode "erc-services" nil t)
(define-erc-module services nickserv
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Fix error introduced in patch-83,
mwolson <=