Merge branch 'emacs-24'.

[gnu-emacs] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 2004de41d0b49c43e96d4066747dd5c03efa8e9b..d4dee6714393b3cadef6ffffb8345f4e957a354b 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -106,7 +106,7 @@
        (erc-channel-user): Add members for new modes.
        (erc-channel-member-halfop-p, erc-channel-user-admin-p)
        (erc-channel-user-owner-p): Use new struct members.
-       (erc-format-nick, erc-format-@nick): Display user modes as nick prefix.
+       (erc-format-nick, erc-format-@nick): Display user modes as nick prefix.
        (erc-nick-prefix-face, erc-my-nick-prefix-face): Add new faces
        (erc-get-user-mode-prefix): Return symbol for mode prefix.
        (erc-update-channel-member, erc-update-current-channel-member)