Mercurial > emacs
comparison lisp/erc/erc-services.el @ 87952:b8f89dd3680d
ERC: Sync version 5.3, release candidate 1.
author | Michael Olson <mwolson@gnu.org> |
---|---|
date | Fri, 25 Jan 2008 03:28:10 +0000 |
parents | aef7ff97a0c2 |
children | 2a734255bcc7 |
comparison
equal
deleted
inserted
replaced
87951:0c208f9e2445 | 87952:b8f89dd3680d |
---|---|
121 (list (intern (completing-read | 121 (list (intern (completing-read |
122 "Choose Nickserv identify mode (RET to disable): " | 122 "Choose Nickserv identify mode (RET to disable): " |
123 '(("autodetect") ("nick-change") ("both")) nil t)))) | 123 '(("autodetect") ("nick-change") ("both")) nil t)))) |
124 (add-hook 'erc-server-NOTICE-functions | 124 (add-hook 'erc-server-NOTICE-functions |
125 'erc-nickserv-identification-autodetect) | 125 'erc-nickserv-identification-autodetect) |
126 (unless erc-networks-mode | |
127 ;; Force-enable networks module, because we need it to set | |
128 ;; erc-network for us. | |
129 (erc-networks-enable)) | |
126 (cond ((eq mode 'autodetect) | 130 (cond ((eq mode 'autodetect) |
127 (setq erc-nickserv-identify-mode 'autodetect) | 131 (setq erc-nickserv-identify-mode 'autodetect) |
128 (add-hook 'erc-server-NOTICE-functions | 132 (add-hook 'erc-server-NOTICE-functions |
129 'erc-nickserv-identify-autodetect) | 133 'erc-nickserv-identify-autodetect) |
130 (remove-hook 'erc-nick-changed-functions | 134 (remove-hook 'erc-nick-changed-functions |
185 (const GalaxyNet) | 189 (const GalaxyNet) |
186 (const GRnet) | 190 (const GRnet) |
187 (const iip) | 191 (const iip) |
188 (const OFTC) | 192 (const OFTC) |
189 (const QuakeNet) | 193 (const QuakeNet) |
194 (const Rizon) | |
190 (const SlashNET) | 195 (const SlashNET) |
191 (symbol :tag "Network name")) | 196 (symbol :tag "Network name")) |
192 (repeat :tag "Nickname and password" | 197 (repeat :tag "Nickname and password" |
193 (cons :tag "Identity" | 198 (cons :tag "Identity" |
194 (string :tag "Nick") | 199 (string :tag "Nick") |
254 ;; OFTC's NickServ doesn't ask you to identify anymore. | 259 ;; OFTC's NickServ doesn't ask you to identify anymore. |
255 nil | 260 nil |
256 "NickServ" | 261 "NickServ" |
257 "IDENTIFY" nil nil | 262 "IDENTIFY" nil nil |
258 "You\\s-are\\s-successfully\\s-identified\\s-as\\s-") | 263 "You\\s-are\\s-successfully\\s-identified\\s-as\\s-") |
264 (Rizon | |
265 "NickServ!service@rizon.net" | |
266 "This\\s-nickname\\s-is\\s-registered\\s-and\\s-protected." | |
267 "NickServ" | |
268 "IDENTIFY" nil nil | |
269 "Password\\s-accepted\\s--\\s-you\\s-are\\s-now\\s-recognized.") | |
259 (QuakeNet | 270 (QuakeNet |
260 nil nil | 271 nil nil |
261 "Q@CServe.quakenet.org" | 272 "Q@CServe.quakenet.org" |
262 "auth" t nil nil) | 273 "auth" t nil nil) |
263 (SlashNET | 274 (SlashNET |