Mercurial > emacs

comparison lisp/erc/erc.el @ 72303:430a916ae2ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update from erc--emacs--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-388 Creator: Michael Olson <mwolson@gnu.org>
author Miles Bader <miles@gnu.org>
date Mon, 07 Aug 2006 07:43:48 +0000
parents ddc702799326
children 4d29d878db63
comparison
equal deleted inserted replaced
72302:ddc702799326 72303:430a916ae2ba
155 "IRC port to use if not specified. 155 "IRC port to use if not specified.
156 156
157 This can be either a string or a number." 157 This can be either a string or a number."
158 :group 'erc 158 :group 'erc
159 :type '(choice (const :tag "None" nil) 159 :type '(choice (const :tag "None" nil)
160 (const :tag "Port number" number) 160 (integer :tag "Port number")
161 (const :tag "Port string" string))) 161 (string :tag "Port string")))
162 162
163 (defcustom erc-nick nil 163 (defcustom erc-nick nil
164 "Nickname to use if one is not provided. 164 "Nickname to use if one is not provided.
165 165
166 This can be either a string, or a list of strings. 166 This can be either a string, or a list of strings.
2361 (let ((string (if (symbolp msg) 2361 (let ((string (if (symbolp msg)
2362 (apply 'erc-format-message msg args) 2362 (apply 'erc-format-message msg args)
2363 msg))) 2363 msg)))
2364 (setq string 2364 (setq string
2365 (cond 2365 (cond
2366 ((null type)
2367 string)
2366 ((listp type) 2368 ((listp type)
2367 (mapc (lambda (type) 2369 (mapc (lambda (type)
2368 (setq string 2370 (setq string
2369 (erc-display-message-highlight type string))) 2371 (erc-display-message-highlight type string)))
2370 type) 2372 type)
2373 (erc-display-message-highlight type string)))) 2375 (erc-display-message-highlight type string))))
2374 2376
2375 (if (not (erc-response-p parsed)) 2377 (if (not (erc-response-p parsed))
2376 (erc-display-line string buffer) 2378 (erc-display-line string buffer)
2377 (unless (member (erc-response.command parsed) erc-hide-list) 2379 (unless (member (erc-response.command parsed) erc-hide-list)
2378 (erc-put-text-property 0 (length string) 'erc-parsed parsed string) 2380 (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
2379 (erc-put-text-property 0 (length string) 'rear-sticky t string) 2381 (erc-put-text-property 0 (length string) 'rear-sticky t string)
2380 (erc-display-line string buffer))))) 2382 (erc-display-line string buffer)))))
2381 2383
2382 (defun erc-message-type-member (position list) 2384 (defun erc-message-type-member (position list)
2383 "Return non-nil if the erc-parsed text-property at POSITION is in LIST. 2385 "Return non-nil if the erc-parsed text-property at POSITION is in LIST.
5944 (ctcp-empty . "Illegal empty CTCP query received from %n. Ignoring.") 5946 (ctcp-empty . "Illegal empty CTCP query received from %n. Ignoring.")
5945 (ctcp-request . "==> CTCP request from %n (%u@%h): %r") 5947 (ctcp-request . "==> CTCP request from %n (%u@%h): %r")
5946 (ctcp-request-to . "==> CTCP request from %n (%u@%h) to %t: %r") 5948 (ctcp-request-to . "==> CTCP request from %n (%u@%h) to %t: %r")
5947 (ctcp-too-many . "Too many CTCP queries in single message. Ignoring") 5949 (ctcp-too-many . "Too many CTCP queries in single message. Ignoring")
5948 (flood-ctcp-off . "FLOOD PROTECTION: Automatic CTCP responses turned off.") 5950 (flood-ctcp-off . "FLOOD PROTECTION: Automatic CTCP responses turned off.")
5949 (flood-strict-mode . "FLOOD PROTECTION: Switched to Strict Flood Control mode.") 5951 (flood-strict-mode
5950 (disconnected . "Connection failed! Re-establishing connection...") 5952 . "FLOOD PROTECTION: Switched to Strict Flood Control mode.")
5951 (disconnected-noreconnect . "Connection failed! Not re-establishing connection.") 5953 (disconnected . "\n\nConnection failed! Re-establishing connection...\n")
5954 (disconnected-noreconnect
5955 . "\n\nConnection failed! Not re-establishing connection.\n")
5956 (finished . "\n\n*** ERC finished ***\n")
5957 (terminated . "\n\n*** ERC terminated: %e\n")
5952 (login . "Logging in as \'%n\'...") 5958 (login . "Logging in as \'%n\'...")
5953 (nick-in-use . "%n is in use. Choose new nickname: ") 5959 (nick-in-use . "%n is in use. Choose new nickname: ")
5954 (nick-too-long . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server") 5960 (nick-too-long
5961 . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server")
5955 (no-default-channel . "No default channel") 5962 (no-default-channel . "No default channel")
5956 (no-invitation . "You've got no invitation") 5963 (no-invitation . "You've got no invitation")
5957 (no-target . "No target") 5964 (no-target . "No target")
5958 (ops . "%i operator%s: %o") 5965 (ops . "%i operator%s: %o")
5959 (ops-none . "No operators in this channel.") 5966 (ops-none . "No operators in this channel.")