[Emacs-diffs] trunk r117956: erc.el: Fix regression - Bug #18551

[Kelvin White]

------------------------------------------------------------
revno: 117956
revision-id: address@hidden
parent: address@hidden
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Fri 2014-09-26 09:05:28 -0400
message:
  erc.el: Fix regression - Bug #18551
modified:
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2014-09-25 14:07:30 +0000
+++ b/lisp/erc/ChangeLog        2014-09-26 13:05:28 +0000
@@ -1,3 +1,7 @@
+2014-09-26  Kelvin White  <address@hidden>
+
+       * erc.el (erc-format-nick): Fix code regression - Bug #18551
+
 2014-09-25  Kelvin White  <address@hidden>
 
        * erc.el: Follow Emacs version instead of tracking it seperately.

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-09-25 14:07:30 +0000
+++ b/lisp/erc/erc.el   2014-09-26 13:05:28 +0000
@@ -4225,11 +4225,12 @@
 (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