aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Danjou2011-05-03 10:37:51 +0200
committerJulien Danjou2011-05-03 10:37:51 +0200
commitf927985e87724306e8eb0827feb3f51c964561f5 (patch)
treec6537e0844d3ff7e82f7f4326d94bca78f42bf3f
parent256661260dfed952d6497aef73607bfe24795614 (diff)
downloademacs-f927985e87724306e8eb0827feb3f51c964561f5.tar.gz
emacs-f927985e87724306e8eb0827feb3f51c964561f5.zip
* lisp/erc/erc-backend.el (671): New response handler.
* lisp/erc/erc.el (english): Add 671 to catalog.
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-backend.el7
-rw-r--r--lisp/erc/erc.el3
3 files changed, 14 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bf9e1e21e0e..5c86b08fdb1 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
12011-05-03 Debarshi Ray <rishi@gnu.org>
2
3 * erc-backend.el (671): New response handler.
4 * erc.el (english): Add 671 to catalog.
5
12011-04-29 Stefan Monnier <monnier@iro.umontreal.ca> 62011-04-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * erc-pcomplete.el (erc-pcomplete-nick-postfix): Remove the " " in the 8 * erc-pcomplete.el (erc-pcomplete-nick-postfix): Remove the " " in the
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 8a25e5f600d..d363ea92bdb 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1951,6 +1951,13 @@ See `erc-display-server-message'." nil
1951 (erc-display-message parsed '(error notice) 'active 's482 1951 (erc-display-message parsed '(error notice) 'active 's482
1952 ?c channel ?m message))) 1952 ?c channel ?m message)))
1953 1953
1954(define-erc-response-handler (671)
1955 "Secure connection response in WHOIS." nil
1956 (let ((nick (second (erc-response.command-args parsed)))
1957 (securemsg (erc-response.contents parsed)))
1958 (erc-display-message parsed 'notice 'active 's671
1959 ?n nick ?a securemsg)))
1960
1954(define-erc-response-handler (431 445 446 451 462 463 464 481 483 484 485 1961(define-erc-response-handler (431 445 446 451 462 463 464 481 483 484 485
1955 491 501 502) 1962 491 501 502)
1956 ;; 431 - No nickname given 1963 ;; 431 - No nickname given
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e2228a43303..a8c592696ad 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6351,7 +6351,8 @@ All windows are opened in the current frame."
6351 (s485 . "You're not the original channel operator") 6351 (s485 . "You're not the original channel operator")
6352 (s491 . "No O-lines for your host") 6352 (s491 . "No O-lines for your host")
6353 (s501 . "Unknown MODE flag") 6353 (s501 . "Unknown MODE flag")
6354 (s502 . "You can't change modes for other users"))) 6354 (s502 . "You can't change modes for other users")
6355 (s671 . "%n %a")))
6355 6356
6356(defun erc-message-english-PART (&rest args) 6357(defun erc-message-english-PART (&rest args)
6357 "Format a proper PART message. 6358 "Format a proper PART message.