diff options
| author | Leo Liu <sdl.web@gmail.com> | 2012-06-24 10:34:52 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2012-06-24 10:34:52 +0800 |
| commit | d939b632e16854db64f4ffc142eb8f9b243c4f5c (patch) | |
| tree | 68b8c1f88effa2dbae72ace71980c5ef648e331c /lisp | |
| parent | c101ef0a3cf3e5c99280beb739c006955865b1ff (diff) | |
| download | emacs-d939b632e16854db64f4ffc142eb8f9b243c4f5c.tar.gz emacs-d939b632e16854db64f4ffc142eb8f9b243c4f5c.tar.bz2 emacs-d939b632e16854db64f4ffc142eb8f9b243c4f5c.zip | |
Backport: Avoid error when process-contact returns t in rcirc
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d51598a777..3e75c2d718f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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> diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 1c74e6190dc..e34b7c79b3b 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -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) |