diff options
| author | Kelvin White <kwhite@gnu.org> | 2014-09-26 09:05:28 -0400 |
|---|---|---|
| committer | Kelvin White <kwhite@gnu.org> | 2014-09-26 09:05:28 -0400 |
| commit | 53c0a1e9d7e5b53cd36a2be38984e6070ac6210f (patch) | |
| tree | eb6849425ad0befe2ef8a2eb4f6b1abad19c0269 /lisp/erc | |
| parent | 241692602563684cb4a964ed2af8776057dd2a8d (diff) | |
| download | emacs-53c0a1e9d7e5b53cd36a2be38984e6070ac6210f.tar.gz | |
erc.el: Fix regression - Bug #18551
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 837203f305c..b5dd3f2f359 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -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. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index f4d9dd3c652..1c832a5fdfa 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -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 |