From: Kelvin White <kelvin.white77@gmail.com>
Date: Thu, 3 Jul 2014 12:30:26 +0000 (-0400)
Subject: Fix nick duplication in format-@nick
X-Git-Tag: emacs-25.0.90~2636^2~73^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=046d53d46e0b619d5504bad92ab9e7c98a7b1c61;p=emacs.git

Fix nick duplication in format-@nick
---

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 8d2ea62b231..d43be54de2b 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -9,7 +9,7 @@
 ;;               Andreas Fuchs (afs@void.at)
 ;;               Gergely Nagy (algernon@midgard.debian.net)
 ;;               David Edmondson (dme@dme.org)
-;;               Kelvin White <kelvin.white77@gmail.com>
+;;               Kelvin White (kwhite@gnu.org)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet
 ;; Version: 5.3
@@ -4252,7 +4252,7 @@ also `erc-format-nick-function'."
     (let ((nick (erc-server-user-nickname user)))
       (concat (erc-propertize
                (erc-get-user-mode-prefix nick)
-               'face 'erc-nick-prefix-face) nick nick))))
+               'face 'erc-nick-prefix-face) nick))))
 
 (defun erc-format-my-nick ()
   "Return the beginning of this user's message, correctly propertized."