Backport: Avoid error when process-contact returns t in rcirc

2 files changed, 9 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d51598a777..3e75c2d718f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-06-24  Leo Liu  <sdl.web@gmail.com>
 
+        * net/rcirc.el (rcirc): Avoid error when process-contact returns t.
+
         * vc/diff-mode.el (diff-file-prev/next): Fix typo.
 
 2012-06-23  Leo Liu  <sdl.web@gmail.com>
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 1c74e6190dc..e34b7c79b3b 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -471,7 +471,8 @@ If ARG is non-nil, instead prompt for connection parameters."
                              rcirc-default-full-name))
               (channels (plist-get (cdr c) :channels))
               (password (plist-get (cdr c) :password))
-              (encryption (plist-get (cdr c) :encryption)))
+              (encryption (plist-get (cdr c) :encryption))
+              contact)
           (when server
             (let (connected)
               (dolist (p (rcirc-process-list))
@@ -483,10 +484,11 @@ If ARG is non-nil, instead prompt for connection parameters."
                                      full-name channels password encryption)
                     (quit (message "Quit connecting to %s" server)))
                 (with-current-buffer (process-buffer connected)
-                  (setq connected-servers
-                        (cons (process-contact (get-buffer-process
-                                                (current-buffer)) :host)
-                              connected-servers))))))))
+                  (setq contact (process-contact
+                                 (get-buffer-process (current-buffer)) :host))
+                  (setq connected-servers
+                        (cons (if (stringp contact) contact server)
+                              connected-servers))))))))
       (when connected-servers
         (message "Already connected to %s"
                  (if (cdr connected-servers)