martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erc.el: Fix regression - Bug #18551

Browse Source
This commit is contained in:
Kelvin White
2014-09-26 09:05:28 -04:00
parent 2416926025
commit 53c0a1e9d7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/erc/ChangeLog
View File

@@ -1,3 +1,7 @@
2014-09-26 Kelvin White <kwhite@gnu.org>
* erc.el (erc-format-nick): Fix code regression - Bug #18551
2014-09-25 Kelvin White <kwhite@gnu.org>
* erc.el: Follow Emacs version instead of tracking it seperately.

5
lisp/erc/erc.el
View File

@@ -4225,11 +4225,12 @@ 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'."
(let ((nick (erc-server-user-nickname user)))
(when user
(let ((nick (erc-server-user-nickname user)))
(concat (erc-propertize
(erc-get-user-mode-prefix nick)
'face 'erc-nick-prefix-face)
nick)))
nick))))
(defun erc-get-user-mode-prefix (user)
(when user