From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Nov 2015 17:24:04 +0000 (+0100)
Subject: upstream merge
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=707260fd62842e99b270684df9d4d6bbef900f55;p=emacs.git

upstream merge
---

707260fd62842e99b270684df9d4d6bbef900f55
diff --cc lisp/erc/erc-pcomplete.el
index e46ac68b259,686a3a8e1d0..4ad5d2e859d
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@@ -225,9 -225,10 +225,10 @@@ If optional argument IGNORE-SELF is non
                   (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) 
++      (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))))