mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208
Creator: Michael Olson <mwolson@gnu.org> Sync from erc--emacs--0
This commit is contained in:
parent
e2db3e59a8
commit
21bc768b9b
6 changed files with 36 additions and 21 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue