diff options
Diffstat (limited to 'lisp/erc/erc-pcomplete.el')
| -rw-r--r-- | lisp/erc/erc-pcomplete.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el index e46ac68b259..686a3a8e1d0 100644 --- a/lisp/erc/erc-pcomplete.el +++ b/lisp/erc/erc-pcomplete.el @@ -225,9 +225,10 @@ If optional argument IGNORE-SELF is non-nil, don't return the current nick." (erc-get-channel-user-list))) (nicks nil)) (dolist (user users) - (unless (and ignore-self - (string= (erc-server-user-nickname (car user)) - (erc-current-nick))) + (unless (or (not user) + (and ignore-self + (string= (erc-server-user-nickname (car user)) + (erc-current-nick)))) (setq nicks (cons (concat (erc-server-user-nickname (car user)) postfix) nicks)))) |