Commit d64a438f authored by Leo Liu's avatar Leo Liu

* lisp/net/rcirc.el (rcirc): Avoid error when process-contact returns

t.
parent b91b7e4d
2012-04-21 Leo Liu <sdl.web@gmail.com>
* net/rcirc.el (rcirc): Avoid error when process-contact returns
t.
2012-04-21 Michael Vehrs <Michael.Burschik@gmx.de>
* woman.el: Add support for "T{ T}" tbl syntax, and fix the
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment