diff options
| author | Kelvin White | 2014-06-19 13:22:31 -0400 |
|---|---|---|
| committer | Kelvin White | 2014-06-19 13:22:31 -0400 |
| commit | 27966b81010f96a4031c6f696f155a693d69dd60 (patch) | |
| tree | d14b033c3c04504e8e7155f33ce3d98d72344e00 /lisp/erc | |
| parent | f104d279f5793a2d850f4d57944452e649d7f1ac (diff) | |
| download | emacs-27966b81010f96a4031c6f696f155a693d69dd60.tar.gz emacs-27966b81010f96a4031c6f696f155a693d69dd60.zip | |
Update comments in erc-format-@nick to reflect changes in last merge.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 987c141d1ef..8d2ea62b231 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el | |||
| @@ -4243,10 +4243,11 @@ See also `erc-format-nick-function'." | |||
| 4243 | (t "")))) | 4243 | (t "")))) |
| 4244 | 4244 | ||
| 4245 | (defun erc-format-@nick (&optional user channel-data) | 4245 | (defun erc-format-@nick (&optional user channel-data) |
| 4246 | "Format the nickname of USER showing if USER is an operator or has voice. | 4246 | "Format the nickname of USER showing if USER has a voice, is an |
| 4247 | Operators have \"@\" and users with voice have \"+\" as a prefix. | 4247 | operator, half-op, admin or owner. Owners have \"~\", admins have |
| 4248 | Use CHANNEL-DATA to determine op and voice status. | 4248 | \"&\", operators have \"@\" and users with voice have \"+\" as a |
| 4249 | See also `erc-format-nick-function'." | 4249 | prefix. Use CHANNEL-DATA to determine op and voice status. See |
| 4250 | also `erc-format-nick-function'." | ||
| 4250 | (when user | 4251 | (when user |
| 4251 | (let ((nick (erc-server-user-nickname user))) | 4252 | (let ((nick (erc-server-user-nickname user))) |
| 4252 | (concat (erc-propertize | 4253 | (concat (erc-propertize |