summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
authorKelvin White <kwhite@gnu.org>2014-09-26 09:22:47 -0400
committerKelvin White <kwhite@gnu.org>2014-09-26 09:22:47 -0400
commitc575c0509a120337d589798f5637d57d01f1f89c (patch)
tree09ce2483d967623465aeb431cbfb8f43b5230249 /lisp/erc
parent53c0a1e9d7e5b53cd36a2be38984e6070ac6210f (diff)
downloademacs-c575c0509a120337d589798f5637d57d01f1f89c.tar.gz
Regression fix - #bug18551
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 1c832a5fdfa..51096bc2c15 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4225,12 +4225,7 @@ and as second argument the event parsed as a vector."
(defun erc-format-nick (&optional user _channel-data)
"Return the nickname of USER.
See also `erc-format-nick-function'."
- (when user
- (let ((nick (erc-server-user-nickname user)))
- (concat (erc-propertize
- (erc-get-user-mode-prefix nick)
- 'face 'erc-nick-prefix-face)
- nick))))
+ (when user (erc-server-user-nickname user)))
(defun erc-get-user-mode-prefix (user)
(when user