upstream merge

diff --cc configure.ac
Simple merge

diff --cc lisp/erc/erc-pcomplete.el
index e46ac68b2594f76c08f54b97ca794d2196a4c89d,686a3a8e1d0f2d465c24497992da1f3d22536265..4ad5d2e859d4f30789f4d128269f8a4bb192502d
--- 1/lisp/erc/erc-pcomplete.el
--- 2/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))))

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge