diff options
| author | Michael Olson <mwolson@gnu.org> | 2007-12-09 06:40:47 +0000 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2007-12-09 06:40:47 +0000 |
| commit | 1c36df9774d33066c804b9d4f124216ffcd5c813 (patch) | |
| tree | 5d49d29618ebbf5f54eb84f5074b22d16225368b /lisp/erc/erc.el | |
| parent | 1d1df709e13c089bdc4567d8553b53e8411edd1a (diff) | |
| download | emacs-1c36df9774d33066c804b9d4f124216ffcd5c813.tar.gz | |
Sync from ERC upstream
Changes include:
- Add nickserv support for GRnet.
- Parse 275 (secure connection) response.
- Provide new hook `erc-nickserv-identified-hook' that runs when
nickserv confirms that the user has successfully identified.
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index e4e9268bfbe..cc9eb7a8f04 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -6213,6 +6213,7 @@ All windows are opened in the current frame." (s252 . "%i operator(s) online") (s253 . "%i unknown connection(s)") (s254 . "%i channels formed") + (s275 . "%n %m") (s301 . "%n is AWAY: %r") (s303 . "Is online: %n") (s305 . "%m") |