diff options
| author | Miles Bader <miles@gnu.org> | 2006-04-11 22:09:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-04-11 22:09:49 +0000 |
| commit | 21bc768b9b693f97940c56b9f4e80b9a7f486e34 (patch) | |
| tree | a6d7a3291d08d2e4428ae1ef39b6eed9288037e1 /lisp/erc/erc-backend.el | |
| parent | e2db3e59a8b85158ad7740d01c8c47fe9a16bdf1 (diff) | |
| download | emacs-21bc768b9b693f97940c56b9f4e80b9a7f486e34.tar.gz emacs-21bc768b9b693f97940c56b9f4e80b9a7f486e34.tar.bz2 emacs-21bc768b9b693f97940c56b9f4e80b9a7f486e34.zip | |
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208
Creator: Michael Olson <mwolson@gnu.org>
Sync from erc--emacs--0
Diffstat (limited to 'lisp/erc/erc-backend.el')
| -rw-r--r-- | lisp/erc/erc-backend.el | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index a99af9dea64..3ea0f74eed7 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -312,13 +312,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 @@ -762,10 +756,10 @@ PROCs `process-buffer' is `current-buffer' when this function is called." (substring string 1 posn))) (setf (erc-response.command msg) - (let* ((bposn (string-match "[^ ]" string posn)) + (let* ((bposn (string-match "[^ \n]" string posn)) (eposn (string-match " " string bposn))) (setq posn (and eposn - (string-match "[^ ]" string eposn))) + (string-match "[^ \n]" string eposn))) (substring string bposn eposn))) (while (and posn @@ -773,7 +767,7 @@ PROCs `process-buffer' is `current-buffer' when this function is called." (push (let* ((bposn posn) (eposn (string-match " " string bposn))) (setq posn (and eposn - (string-match "[^ ]" string eposn))) + (string-match "[^ \n]" string eposn))) (substring string bposn eposn)) (erc-response.command-args msg))) (when posn |