diff options
author | Miles Bader <miles@gnu.org> | 2007-12-16 05:08:49 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-12-16 05:08:49 +0000 |
commit | d29ee6b1a110cf5d170a10317a96acbbd4a1c68b (patch) | |
tree | 58f3c40766d8d56de7d2b026c29e198764d910aa /lisp/erc/erc-backend.el | |
parent | 7e095e45a3f790e4608c88db9648d248e24901dc (diff) | |
parent | 47854a55680b5809811caf72f66ecbe8289c2855 (diff) | |
download | emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.tar.gz emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.tar.bz2 emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.zip |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
Diffstat (limited to 'lisp/erc/erc-backend.el')
-rw-r--r-- | lisp/erc/erc-backend.el | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index c0f4205c012..5d94408ad4f 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -515,7 +515,7 @@ We will store server variables in the buffer given by BUFFER." (set-process-filter process 'erc-server-filter-function) (set-process-buffer process buffer))) (erc-log "\n\n\n********************************************\n") - (message (erc-format-message + (message "%s" (erc-format-message 'login ?n (with-current-buffer buffer (erc-current-nick)))) ;; wait with script loading until we receive a confirmation (first @@ -1538,6 +1538,16 @@ A server may send more than one 005 message." See `erc-display-server-message'." nil (erc-display-server-message proc parsed)) +(define-erc-response-handler (275) + "Display secure connection message." nil + (multiple-value-bind (nick user message) + (cdr (erc-response.command-args parsed)) + (erc-display-message + parsed 'notice 'active 's275 + ?n nick + ?m (mapconcat 'identity (cddr (erc-response.command-args parsed)) + " ")))) + (define-erc-response-handler (290) "Handle dancer-ircd CAPAB messages." nil nil) |