[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ae24d82 1/2: erc-pcomplete.el (pcomplete-erc-nicks)
From: |
Kelvin White |
Subject: |
[Emacs-diffs] master ae24d82 1/2: erc-pcomplete.el (pcomplete-erc-nicks): Fix bug#18771 |
Date: |
Sat, 07 Nov 2015 18:03:56 +0000 |
branch: master
commit ae24d821faba48fbc74ace082ff28669f9e1cec3
Author: Kelvin White <address@hidden>
Commit: Kelvin White <address@hidden>
erc-pcomplete.el (pcomplete-erc-nicks): Fix bug#18771
---
lisp/erc/ChangeLog.2 | 5 +++++
lisp/erc/erc-pcomplete.el | 7 ++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/erc/ChangeLog.2 b/lisp/erc/ChangeLog.2
index 8dce508..80ee3bb 100644
--- a/lisp/erc/ChangeLog.2
+++ b/lisp/erc/ChangeLog.2
@@ -1,3 +1,8 @@
+2015-11-07 Kelvin White <address@hidden>
+
+ * erc-pcomplete.el (pcomplete-erc-nicks): Fix bug for tab complete
+ (bug#18771)
+
2015-03-25 Stefan Monnier <address@hidden>
* erc.el (erc-switch-to-buffer): Fix last change (bug#20187).
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index e46ac68..686a3a8 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))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master ae24d82 1/2: erc-pcomplete.el (pcomplete-erc-nicks): Fix bug#18771,
Kelvin White <=