diff options
| author | Julien Danjou | 2010-10-23 13:04:47 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-23 13:04:47 -0700 |
| commit | 7de0e00334c842afcc4e727c915b379797738fe9 (patch) | |
| tree | 29a44400c4d4de477d2fc6e0a8009a513dc11f03 | |
| parent | 6bb55f7cb0258425ff49bd65533aeb16a58afb67 (diff) | |
| download | emacs-7de0e00334c842afcc4e727c915b379797738fe9.tar.gz emacs-7de0e00334c842afcc4e727c915b379797738fe9.zip | |
* erc-backend.el (erc-server-JOIN): Set the correct target list on join.
| -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 @@ | |||
| 1 | 2010-10-23 Julien Danjou <julien@danjou.info> | 1 | 2010-10-23 Julien Danjou <julien@danjou.info> |
| 2 | 2 | ||
| 3 | * erc-backend.el (erc-server-JOIN): Set the correct target list on join. | ||
| 4 | |||
| 3 | * erc-backend.el (erc-process-sentinel): Check that buffer is alive | 5 | * erc-backend.el (erc-process-sentinel): Check that buffer is alive |
| 4 | before setting it as current buffer. | 6 | before setting it as current buffer. |
| 5 | 7 | ||
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." | |||
| 1195 | (setq buffer (erc-open erc-session-server erc-session-port | 1195 | (setq buffer (erc-open erc-session-server erc-session-port |
| 1196 | nick erc-session-user-full-name | 1196 | nick erc-session-user-full-name |
| 1197 | nil nil | 1197 | nil nil |
| 1198 | erc-default-recipients chnl | 1198 | (list chnl) chnl |
| 1199 | erc-server-process)) | 1199 | erc-server-process)) |
| 1200 | (when buffer | 1200 | (when buffer |
| 1201 | (set-buffer buffer) | 1201 | (set-buffer buffer) |