summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 @@
+2011-05-03 Debarshi Ray <rishi@gnu.org>
+
+ * erc-backend.el (671): New response handler.
+ * erc.el (english): Add 671 to catalog.
+
2011-04-29 Stefan Monnier <monnier@iro.umontreal.ca>
* 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
(erc-display-message parsed '(error notice) 'active 's482
?c channel ?m message)))
+(define-erc-response-handler (671)
+ "Secure connection response in WHOIS." nil
+ (let ((nick (second (erc-response.command-args parsed)))
+ (securemsg (erc-response.contents parsed)))
+ (erc-display-message parsed 'notice 'active 's671
+ ?n nick ?a securemsg)))
+
(define-erc-response-handler (431 445 446 451 462 463 464 481 483 484 485
491 501 502)
;; 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."
(s485 . "You're not the original channel operator")
(s491 . "No O-lines for your host")
(s501 . "Unknown MODE flag")
- (s502 . "You can't change modes for other users")))
+ (s502 . "You can't change modes for other users")
+ (s671 . "%n %a")))
(defun erc-message-english-PART (&rest args)
"Format a proper PART message.