[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107984: * lisp/net/rcirc.el (rcir
From: |
Leo Liu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107984: * lisp/net/rcirc.el (rcirc): Avoid error when process-contact returns |
Date: |
Fri, 02 Nov 2012 01:56:03 -0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 107984
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sat 2012-04-21 22:12:27 +0800
message:
* lisp/net/rcirc.el (rcirc): Avoid error when process-contact returns
t.
modified:
lisp/ChangeLog
lisp/net/rcirc.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-04-21 05:54:39 +0000
+++ b/lisp/ChangeLog 2012-04-21 14:12:27 +0000
@@ -1,3 +1,8 @@
+2012-04-21 Leo Liu <address@hidden>
+
+ * net/rcirc.el (rcirc): Avoid error when process-contact returns
+ t.
+
2012-04-21 Michael Vehrs <address@hidden>
* woman.el: Add support for "T{ T}" tbl syntax, and fix the
=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2012-04-14 01:46:06 +0000
+++ b/lisp/net/rcirc.el 2012-04-21 14:12:27 +0000
@@ -479,7 +479,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))
@@ -491,10 +492,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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r107984: * lisp/net/rcirc.el (rcirc): Avoid error when process-contact returns,
Leo Liu <=