From: Kelvin White <kwhite@gnu.org>
Date: Fri, 26 Sep 2014 13:22:47 +0000 (-0400)
Subject: Regression fix - #bug18551
X-Git-Tag: emacs-25.0.90~2635^2~679^2~214
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c575c0509a120337d589798f5637d57d01f1f89c;p=emacs.git

Regression fix - #bug18551
---

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