emacs: lisp/erc/erc-backend.el comparison

comparison lisp/erc/erc-backend.el @ 87687:aef7ff97a0c2

ERC: Sync changes from upstream.

author	Michael Olson <mwolson@gnu.org>
date	Thu, 10 Jan 2008 03:51:14 +0000
parents	107ccd98fa12
children	b8f89dd3680d

comparison

equal deleted inserted replaced

-:a7108d800053
+:aef7ff97a0c2
 ?h (first (erc-response.command-args parsed)) ?i erc-server-lag
 ?s (if (/= erc-server-lag 1) "s" "")))
 (erc-update-mode-line))))
 (define-erc-response-handler (PRIVMSG NOTICE)
-nil nil
+"Handle private messages, including messages in channels." nil
 (let ((sender-spec (erc-response.sender parsed))
 (cmd (erc-response.command parsed))
 (tgt (car (erc-response.command-args parsed)))
 (msg (erc-response.contents parsed)))
 (if (or (erc-ignored-user-p sender-spec)
 ;; FIXME: need clean way of specifiying extra hooks in
 ;; define-erc-response-handler.
 (add-hook 'erc-server-PRIVMSG-functions 'erc-auto-query)
 (define-erc-response-handler (QUIT)
-nil nil
+"Another user has quit IRC." nil
 (let ((reason (erc-response.contents parsed))
 bufs)
 (multiple-value-bind (nick login host)
 (erc-parse-user (erc-response.sender parsed))
 (setq bufs (erc-buffer-list-with-nick nick proc))
 (erc-display-message parsed 'notice bufs
 'QUIT ?n nick ?u login
 ?h host ?r reason))))
 (define-erc-response-handler (TOPIC)
-nil nil
+"The channel topic has changed." nil
 (let* ((ch (first (erc-response.command-args parsed)))
 (topic (erc-trim-string (erc-response.contents parsed)))
 (time (format-time-string "%T %m/%d/%y" (current-time))))
 (multiple-value-bind (nick login host)
 (erc-parse-user (erc-response.sender parsed))
 (erc-display-message parsed 'notice (erc-get-buffer ch proc)
 'TOPIC ?n nick ?u login ?h host
 ?c ch ?T topic))))
 (define-erc-response-handler (WALLOPS)
-nil nil
+"Display a WALLOPS message." nil
 (let ((message (erc-response.contents parsed)))
 (multiple-value-bind (nick login host)
 (erc-parse-user (erc-response.sender parsed))
 (erc-display-message
 parsed 'notice nil
 (erc-display-message
 parsed 'notice (if erc-server-connected 'active proc)
 (erc-response.contents parsed)))
 (define-erc-response-handler (376 422)
-nil nil
+"End of MOTD/MOTD is missing." nil
 (erc-server-MOTD proc parsed)
 (erc-connection-established proc parsed))
 (define-erc-response-handler (004)
-nil nil
+"Display the server's identification." nil
 (multiple-value-bind (server-name server-version)
 (cdr (erc-response.command-args parsed))
 (setq erc-server-version server-version)
 (setq erc-server-announced-name server-name)
 (erc-update-mode-line-buffer (process-buffer proc))
 .
 ,(match-string 2 section))))))
 (erc-display-message parsed 'notice proc line)))
 (define-erc-response-handler (221)
-nil nil
+"Display the current user modes." nil
 (let* ((nick (first (erc-response.command-args parsed)))
 (modes (mapconcat 'identity
 (cdr (erc-response.command-args parsed)) " ")))
 (erc-set-modes nick modes)
 (erc-display-message parsed 'notice 'active 's221 ?n nick ?m modes)))
 (erc-display-message
 parsed 'notice 'active catalog-entry
 ?n nick ?f fname ?u user ?h host))))
 (define-erc-response-handler (312)
-nil nil
+"Server name response in WHOIS." nil
 (multiple-value-bind (nick server-host)
 (cdr (erc-response.command-args parsed))
 (erc-display-message
 parsed 'notice 'active 's312
 ?n nick ?s server-host ?c (erc-response.contents parsed))))
 (define-erc-response-handler (315 318 323 369)
 ;; 315 - End of WHO
 ;; 318 - End of WHOIS list
 ;; 323 - End of channel LIST
 ;; 369 - End of WHOWAS
-nil nil
+"End of WHO/WHOIS/LIST/WHOWAS notices." nil
 (ignore proc parsed))
 (define-erc-response-handler (317)
 "IDLE notice." nil
 (multiple-value-bind (nick seconds-idle on-since time)
 (erc-display-message
 parsed 'notice 'active 's317
 ?n nick ?i (erc-sec-to-time (string-to-number seconds-idle))))))
 (define-erc-response-handler (319)
-nil nil
+"Channel names in WHOIS response." nil
 (erc-display-message
 parsed 'notice 'active 's319
 ?n (second (erc-response.command-args parsed))
 ?c (erc-response.contents parsed)))
 (erc-display-message
 parsed 'notice (erc-get-buffer channel proc)
 's329 ?c channel ?t (format-time-string "%A %Y/%m/%d %X" time))))
 (define-erc-response-handler (330)
-nil nil
+"Nick is authed as (on Quakenet network)." nil
 ;; FIXME: I don't know what the magic numbers mean.  Mummy, make
 ;; the magic numbers go away.
 ;; No seriously, I have no clue about the format of this command,
 ;; and don't sit on Quakenet, so can't test.  Originally we had:
 ;; nick == (aref parsed 3)
 (authmsg (erc-response.contents parsed)))
 (erc-display-message parsed 'notice 'active 's330
 ?n nick ?a authmsg ?i authaccount)))
 (define-erc-response-handler (331)
-"Channel topic." nil
+"No topic set for channel." nil
 (let ((channel (second (erc-response.command-args parsed)))
 (topic (erc-response.contents parsed)))
-;; FIXME: why don't we do anything with the topic? -- Lawrence 2004/05/10
 (erc-display-message parsed 'notice (erc-get-buffer channel proc)
 's331 ?c channel)))
 (define-erc-response-handler (332)
 "TOPIC notice." nil
 (erc-update-channel-topic channel topic)
 (erc-display-message parsed 'notice (erc-get-buffer channel proc)
 's332 ?c channel ?T topic)))
 (define-erc-response-handler (333)
-;; Who set the topic, and when
+"Who set the topic, and when." nil
-nil nil
 (multiple-value-bind (channel nick time)
 (cdr (erc-response.command-args parsed))
 (setq time (format-time-string "%T %Y/%m/%d"
 (erc-string-to-emacs-time time)))
 (erc-update-channel-topic channel
 "End of NAMES." nil
 (erc-with-buffer ((second (erc-response.command-args parsed)) proc)
 (erc-channel-end-receiving-names)))
 (define-erc-response-handler (367)
-"Channel ban list entries" nil
+"Channel ban list entries." nil
 (multiple-value-bind (channel banmask setter time)
 (cdr (erc-response.command-args parsed))
 ;; setter and time are not standard
 (if setter
 (erc-display-message parsed 'notice 'active 's367-set-by
 (erc-display-message parsed 'notice 'active 's367
 ?c channel
 ?b banmask))))
 (define-erc-response-handler (368)
-"End of channel ban list" nil
+"End of channel ban list." nil
 (let ((channel (second (erc-response.command-args parsed))))
 (erc-display-message parsed 'notice 'active 's368
 ?c channel)))
 (define-erc-response-handler (379)
 (cdr (erc-response.command-args parsed))
 (erc-display-message parsed 'notice 'active
 's379 ?c from ?f to)))
 (define-erc-response-handler (391)
-"Server's time string" nil
+"Server's time string." nil
 (erc-display-message
 parsed 'notice 'active
 's391 ?s (second (erc-response.command-args parsed))
 ?t (third (erc-response.command-args parsed))))
 (erc-display-message parsed '(notice error) 'active
 's404 ?c (second (erc-response.command-args parsed))))
 (define-erc-response-handler (405)
-;; Can't join that many channels.
+"Can't join that many channels." nil
-nil nil
 (erc-display-message parsed '(notice error) 'active
 's405 ?c (second (erc-response.command-args parsed))))
 (define-erc-response-handler (406)
-;; No such nick
+"No such nick." nil
-nil nil
 (erc-display-message parsed '(notice error) 'active
 's406 ?n (second (erc-response.command-args parsed))))
 (define-erc-response-handler (412)
-;; No text to send
+"No text to send." nil
-nil nil
 (erc-display-message parsed '(notice error) 'active 's412))
 (define-erc-response-handler (421)
-;; Unknown command
+"Unknown command." nil
-nil nil
 (erc-display-message parsed '(notice error) 'active 's421
 ?c (second (erc-response.command-args parsed))))
 (define-erc-response-handler (432)
-;; Bad nick.
+"Bad nick." nil
-nil nil
 (erc-display-message parsed '(notice error) 'active 's432
 ?n (second (erc-response.command-args parsed))))
 (define-erc-response-handler (433)
-;; Login-time "nick in use"
+"Login-time \"nick in use\"." nil
-nil nil
 (erc-nickname-in-use (second (erc-response.command-args parsed))
 "already in use"))
 (define-erc-response-handler (437)
-;; Nick temporarily unavailable (IRCnet)
+"Nick temporarily unavailable (on IRCnet)." nil
-nil nil
 (let ((nick/channel (second (erc-response.command-args parsed))))
 (unless (erc-channel-p nick/channel)
 (erc-nickname-in-use nick/channel "temporarily unavailable"))))
 (define-erc-response-handler (442)
-;; Not on channel
+"Not on channel." nil
-nil nil
 (erc-display-message parsed '(notice error) 'active 's442
 ?c (second (erc-response.command-args parsed))))
 (define-erc-response-handler (461)
-;; Not enough params for command.
+"Not enough parameters for command." nil
-nil nil
 (erc-display-message parsed '(notice error)  'active 's461
 ?c (second (erc-response.command-args parsed))
 ?m (erc-response.contents parsed)))
 (define-erc-response-handler (465)
 (erc-display-error-notice
 parsed
 (erc-response.contents parsed)))
 (define-erc-response-handler (474)
-"Banned from channel errors" nil
+"Banned from channel errors." nil
 (erc-display-message parsed '(notice error) nil
 (intern (format "s%s"
 (erc-response.command parsed)))
 ?c (second (erc-response.command-args parsed))))
 (second (erc-response.command-args parsed))))))
 (when (and key (> (length key) 0))
 (erc-cmd-JOIN channel key)))))
 (define-erc-response-handler (477)
-nil nil
+"Channel doesn't support modes." nil
 (let ((channel (second (erc-response.command-args parsed)))
 (message (erc-response.contents parsed)))
 (erc-display-message parsed 'notice (erc-get-buffer channel proc)
 (format "%s: %s" channel message))))
 (define-erc-response-handler (482)
-nil nil
+"You need to be a channel operator to do that." nil
 (let ((channel (second (erc-response.command-args parsed)))
 (message (erc-response.contents parsed)))
 (erc-display-message parsed '(error notice) 'active 's482
 ?c channel ?m message)))
 ;; 484 - Your connection is restricted!
 ;; 485 - You're not the original channel operator
 ;; 491 - No O-lines for your host
 ;; 501 - Unknown MODE flag
 ;; 502 - Cannot change mode for other users
-nil nil
+"Generic display of server error messages.
+See `erc-display-error-notice'." nil
 (erc-display-error-notice
 parsed
 (intern (format "s%s" (erc-response.command parsed)))))
 ;; FIXME: These are yet to be implemented, they're just stubs for now

Mercurial > emacs

comparison lisp/erc/erc-backend.el @ 87687:aef7ff97a0c2