andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Leo Liu 2012-06-24 10:34:52 +08:00
parent c101ef0a3c
commit d939b632e1
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -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>

12
lisp/net/rcirc.el
View file

@ -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)