diff options
Diffstat (limited to 'lisp/erc/erc-dcc.el')
| -rw-r--r-- | lisp/erc/erc-dcc.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index 526add1a61f..f3b23369981 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -88,13 +88,13 @@ All values of the list must be uppercase strings.") (:nick \"nick\" :type SEND :peer server-proc :parent parent-proc :file file :sent <marker> :confirmed <marker>)) - :nick - a user or userhost for the peer. combine with :parent to reach them + :nick - a user or userhost for the peer. Combine with :parent to reach them :type - the type of DCC connection - SEND for outgoing files, GET for - incoming, and CHAT for both directions. To tell which end started + incoming, and CHAT for both directions. To tell which end started the DCC chat, look at :peer - :peer - the other end of the DCC connection. In the case of outgoing DCCs, + :peer - the other end of the DCC connection. In the case of outgoing DCCs, this represents a server process until a connection is established :parent - the server process where the dcc connection was established. @@ -102,7 +102,7 @@ All values of the list must be uppercase strings.") connection is in general independent from a particular server connection after it was established. - :file - for outgoing sends, the full path to the file. for incoming sends, + :file - for outgoing sends, the full path to the file. For incoming sends, the suggested filename or vetted filename :size - size of the file, may be nil on incoming DCCs") @@ -163,11 +163,11 @@ All values of the list must be uppercase strings.") (defun erc-dcc-member (&rest args) "Return the first matching entry in `erc-dcc-list' which satisfies the -constraints given as a plist in ARGS. Returns nil on no match. +constraints given as a plist in ARGS. Returns nil on no match. The property :nick is treated specially, if it contains a `!' character, it is treated as a nick!user@host string, and compared with the :nick property -value of the individual elements using string-equal. Otherwise it is +value of the individual elements using string-equal. Otherwise it is compared with `erc-nick-equal-p' which is IRC case-insensitive." (let ((list erc-dcc-list) result test) @@ -338,8 +338,8 @@ string \".*!.*@.*\" to this list." :type '(repeat regexp)) (defun erc-dcc-server (name filter sentinel) - "Start listening on a port for an incoming DCC connection. Returns the newly -created subprocess, or nil." + "Start listening on a port for an incoming DCC connection. +Returns the newly created subprocess, or nil." (let ((port (or (and erc-dcc-port-range (car erc-dcc-port-range)) t)) (upper (and erc-dcc-port-range (cdr erc-dcc-port-range))) process) @@ -686,7 +686,7 @@ It extracts the information about the dcc request and adds it to (defun erc-dcc-auto-mask-p (spec) "Takes a full SPEC of a user in the form \"nick!login@host\" and -matches against all the regexp's in `erc-dcc-auto-masks'. If any +matches against all the regexp's in `erc-dcc-auto-masks'. If any match, returns that regexp and nil otherwise." (let ((lst erc-dcc-auto-masks)) (while (and lst @@ -908,7 +908,7 @@ other client." (defun erc-dcc-get-file (entry file parent-proc) "This function does the work of setting up a transfer from the remote client -to the local one over a tcp connection. This involves setting up a process +to the local one over a tcp connection. This involves setting up a process filter and a process sentinel, and making the connection." (let* ((buffer (generate-new-buffer (file-name-nondirectory file))) proc) @@ -1156,7 +1156,7 @@ other client." buffer)) (defun erc-dcc-chat-accept (entry parent-proc) - "Accept an incoming DCC connection and open a DCC window" + "Accept an incoming DCC connection and open a DCC window." (let* ((nick (erc-extract-nick (plist-get entry :nick))) buffer proc) (setq proc |