Mercurial > emacs
diff lisp/erc/erc-backend.el @ 69942:45937d0cd26d
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208
Creator: Michael Olson <mwolson@gnu.org>
Sync from erc--emacs--0
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 11 Apr 2006 22:09:49 +0000 |
| parents | fc745b05e928 |
| children | 3d0d6e217db9 |
line wrap: on
line diff
--- a/lisp/erc/erc-backend.el Tue Apr 11 21:46:26 2006 +0000 +++ b/lisp/erc/erc-backend.el Tue Apr 11 22:09:49 2006 +0000 @@ -312,13 +312,7 @@ :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 @@ (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 @@ (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