diff options
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-backend.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 4143893008f..6eacc035552 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,5 +1,7 @@ 2010-10-23 Julien Danjou <julien@danjou.info> + * erc-backend.el (erc-server-JOIN): Set the correct target list on join. + * erc-backend.el (erc-process-sentinel): Check that buffer is alive before setting it as current buffer. diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 92b1c761a30..f9c74a7af3e 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1195,7 +1195,7 @@ add things to `%s' instead." (setq buffer (erc-open erc-session-server erc-session-port nick erc-session-user-full-name nil nil - erc-default-recipients chnl + (list chnl) chnl erc-server-process)) (when buffer (set-buffer buffer) |