[Emacs-diffs] trunk r117369: Update comments in address@hidden to reflect changes in last merge.

[Kelvin White]

------------------------------------------------------------
revno: 117369
revision-id: address@hidden
parent: address@hidden
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Thu 2014-06-19 13:22:31 -0400
message:
  Update comments in address@hidden to reflect changes in last merge.
modified:
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-06-19 16:56:18 +0000
+++ b/lisp/erc/erc.el   2014-06-19 17:22:31 +0000
@@ -4243,10 +4243,11 @@
           (t ""))))
 
 (defun address@hidden (&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