Mercurial > emacs
diff lisp/erc/erc-autoaway.el @ 74093:bc5d69739d5e
Merge from erc--emacs--22
Merge from my ERC Emacs 22 integration branch. The version is now "5.2
stable pre-release". This will probably be the last change to the
version of ERC in Emacs 22 before the release, pending any bugfixes. For
details on the changes, see the lisp/erc/ChangeLog file.
Note that ERC is now invoked with M-x erc, not M-x erc-select. If you
were using the old `erc' function programmatically, use `erc-open'
instead.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-520
Creator: Michael Olson <mwolson@gnu.org>
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 20 Nov 2006 06:50:29 +0000 |
| parents | ee3d80fd6bb9 |
| children | 7a3f13e2dd57 |
line wrap: on
line diff
--- a/lisp/erc/erc-autoaway.el Mon Nov 20 02:48:15 2006 +0000 +++ b/lisp/erc/erc-autoaway.el Mon Nov 20 06:50:29 2006 +0000 @@ -38,7 +38,7 @@ (defvar erc-autoaway-idletimer nil "The Emacs idletimer. -This is only used when `erc-autoaway-use-emacs-idle' is non-nil.") +This is only used when `erc-autoaway-idle-method' is set to 'emacs.") ;;;###autoload (autoload 'erc-autoaway-mode "erc-autoaway") (define-erc-module autoaway nil @@ -206,6 +206,7 @@ ;; 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 + (not erc-autoaway-caused-away) (not (erc-away-p))) (let ((idle-time (erc-time-diff erc-autoaway-last-sent-time current-time)))