diff options
author | Michael Olson <mwolson@gnu.org> | 2007-11-29 22:36:38 +0000 |
---|---|---|
committer | Michael Olson <mwolson@gnu.org> | 2007-11-29 22:36:38 +0000 |
commit | 2131c501dd40482c6c30b538eecfc7e9ab4e58d2 (patch) | |
tree | 861f8992c4737997bd3470d7c7748fe369798d15 /lisp/erc/erc-autoaway.el | |
parent | b510360c6bf66da86512b837c9533cbd24b776fe (diff) | |
download | emacs-2131c501dd40482c6c30b538eecfc7e9ab4e58d2.tar.gz |
Sync from upstream ERC
- Parse 307 (nick has identified) responses.
- Only activate some things if the connection has been established.
Diffstat (limited to 'lisp/erc/erc-autoaway.el')
-rw-r--r-- | lisp/erc/erc-autoaway.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el index c70beb112e2..4c841387d7f 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el @@ -248,7 +248,8 @@ exceeds `erc-autoaway-idle-seconds'." ;; A test for (erc-server-process-alive) is not necessary, because ;; this function is called from `erc-timer-hook', which is called ;; whenever the server sends something to the client. - (when (and erc-auto-set-away + (when (and erc-server-connected + erc-auto-set-away (not erc-autoaway-caused-away) (erc-autoaway-some-open-server-buffer)) (let ((idle-time (erc-time-diff erc-autoaway-last-sent-time |