[Erc-commit] [commit][emacs22] Fix to always run `erc-before-connect' hook before connecting.

[mwolson]

commit 391a8312bfa72b69a5654c6608e4e053368ffba0
Author: Diane Murray <address@hidden>
Date:   Thu Jan 11 12:18:39 2007 +0000

    Fix to always run `erc-before-connect' hook before connecting.
    
    * erc.el (erc-open): Run `erc-before-connect' hook here.  This
    makes sure the hook always gets called before a connection is
    made, as some functions, like `erc-handle-irc-url', use `erc-open'
    instead of `erc'.
    (erc): Removed `erc-before-connect' hook.
    git-archimport-id: address@hidden/erc--main--0--patch-88

diff --git a/ChangeLog b/ChangeLog
index a28b428..503d29d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-01-11  Diane Murray  <address@hidden>
 
+       * erc.el (erc-open): Run `erc-before-connect' hook here.  This
+       makes sure the hook always gets called before a connection is
+       made, as some functions, like `erc-handle-irc-url', use `erc-open'
+       instead of `erc'.
+       (erc): Removed `erc-before-connect' hook.
+
        * erc-menu.el (erc-menu-definition): Put items specific to
        channels in a "Current channel" submenu.
 
diff --git a/erc.el b/erc.el
index cbd4be0..e6e21c8 100644
--- a/erc.el
+++ b/erc.el
@@ -1925,6 +1925,7 @@ Returns the buffer for the given server or channel."
        (old-buffer (current-buffer))
        old-point
        continued-session)
+    (when connect (run-hook-with-args 'erc-before-connect server port nick))
     (erc-update-modules)
     (set-buffer buffer)
     (setq old-point (point))
@@ -2136,8 +2137,6 @@ server and full-name will be set to those values, whereas
 `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
 be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
-
-  (run-hook-with-args 'erc-before-connect server port nick)
   (erc-open server port nick full-name t password))
 
 (defalias 'erc-select 'erc)