Update comments in erc-format-@nick to reflect changes in last merge.

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 987c141d1efe417864c6e0dade7588aba08bfba6..8d2ea62b2311f0053444c95fe6526747b2007e16 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4243,10 +4243,11 @@ See also `erc-format-nick-function'."
           (t ""))))
 
 (defun erc-format-@nick (&optional user channel-data)
-  "Format the nickname of USER showing if USER is an operator or has voice.
-Operators have \"@\" and users with voice have \"+\" as a prefix.
-Use CHANNEL-DATA to determine op and voice status.
-See also `erc-format-nick-function'."
+  "Format the nickname of USER showing if USER has a voice, is an
+operator, half-op, admin or owner. Owners have \"~\", admins have
+\"&\", operators have \"@\" and users with voice have \"+\" as a
+prefix.  Use CHANNEL-DATA to determine op and voice status.  See
+also `erc-format-nick-function'."
   (when user
     (let ((nick (erc-server-user-nickname user)))
       (concat (erc-propertize