From d64a438f6a88f5db66ddf21ff97f9e06c00e33b0 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sat, 21 Apr 2012 22:12:27 +0800 Subject: [PATCH] * lisp/net/rcirc.el (rcirc): Avoid error when process-contact returns t. --- lisp/ChangeLog | 5 +++++ lisp/net/rcirc.el | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 004a52c8d3..1b9ef8dbd0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-04-21 Leo Liu + + * net/rcirc.el (rcirc): Avoid error when process-contact returns + t. + 2012-04-21 Michael Vehrs * woman.el: Add support for "T{ T}" tbl syntax, and fix the diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 485af6e1b5..1898b3d074 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -479,7 +479,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)) @@ -491,10 +492,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) -- 2.20.1