[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108052: Backport: Avoid error when process-contact returns t in rcirc

[Leo Liu]

------------------------------------------------------------
revno: 108052
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-06-24 10:34:52 +0800
message:
  Backport: Avoid error when process-contact returns t in rcirc
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-24 02:30:51 +0000
+++ b/lisp/ChangeLog    2012-06-24 02:34:52 +0000
@@ -1,5 +1,7 @@
 2012-06-24  Leo Liu  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2012-04-08 13:20:43 +0000
+++ b/lisp/net/rcirc.el 2012-06-24 02:34:52 +0000
@@ -471,7 +471,8 @@
                             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 @@
                                     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)