[Erc-commit] [commit][emacs22] Make erc-server-connect-function definition simpler.

[mwolson]

commit aea132d40c73053d2e4ce4980729a228a8fef574
Author: Michael Olson <address@hidden>
Date:   Sat Apr 1 19:03:42 2006 +0000

    Make erc-server-connect-function definition simpler.
    
    * erc-backend.el (erc-server-connect-function): Don't try to detect the
      existence of the `open-network-stream-nowait' function, since I can't
      find it in Emacs21, XEmacs21, or Emacs22.
    git-archimport-id: address@hidden/erc--cvs--0--patch-151

diff --git a/ChangeLog b/ChangeLog
index f41fedc..05a7266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-01  Michael Olson  <address@hidden>
+
+       * erc-backend.el (erc-server-connect-function): Don't try to
+       detect the existence of the `open-network-stream-nowait' function,
+       since I can't find it in Emacs21, XEmacs21, or Emacs22.
+
 2006-03-27  Michael Olson  <address@hidden>
 
        * erc.texi: Update direntry.  Remove unneeded local variables.
diff --git a/erc-backend.el b/erc-backend.el
index 8c4b915..5d2903e 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -314,13 +314,7 @@ alist."
   :type '(repeat (cons (string :tag "Target")
                        coding-system)))
 
-(defcustom erc-server-connect-function
-  (if (and (fboundp 'open-network-stream-nowait)
-           ;; CVS Emacs claims to define open-network-stream-nowait on
-           ;; windows, however, it does, in fact, not work.
-           (not (memq system-type '(windows-nt cygwin ms-dos darwin))))
-      'open-network-stream-nowait
-    'open-network-stream)
+(defcustom erc-server-connect-function 'open-network-stream
   "Function used to initiate a connection.
 It should take same arguments as `open-network-stream' does."
   :group 'erc-server