[Emacs-diffs] /srv/bzr/emacs/trunk r103789: * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's

[Tassilo Horn]

------------------------------------------------------------
revno: 103789
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-31 14:19:17 +0200
message:
  * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's
  an entry for that server in rcirc-authinfo. (Bug#8385)
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-31 07:20:38 +0000
+++ b/lisp/ChangeLog    2011-03-31 12:19:17 +0000
@@ -1,3 +1,8 @@
+2011-03-31  Tassilo Horn  <address@hidden>
+
+       * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's
+       an entry for that server in rcirc-authinfo. (Bug#8385)
+
 2011-03-31  Glenn Morris  <address@hidden>
 
        * progmodes/f90.el (f90-find-tag-default): Handle multiple `%'.

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-03-22 11:51:48 +0000
+++ b/lisp/net/rcirc.el 2011-03-31 12:19:17 +0000
@@ -2454,7 +2454,15 @@
     (setq rcirc-nick (car args))
     (rcirc-update-prompt)
     (if rcirc-auto-authenticate-flag
-        (if rcirc-authenticate-before-join
+        (if (and rcirc-authenticate-before-join
+                ;; We have to ensure that there's an authentication
+                ;; entry for that server.  Else,
+                ;; rcirc-authenticated-hook won't be triggered, and
+                ;; autojoin won't happen at all.
+                (let (auth-required)
+                  (dolist (s rcirc-authinfo auth-required)
+                    (when (string-match (car s) rcirc-server-name)
+                      (setq auth-required t)))))
             (progn
              (add-hook 'rcirc-authenticated-hook 
'rcirc-join-channels-post-auth t t)
               (rcirc-authenticate))