[Erc-commit] [commit][emacs22] Fixed a bug in the `erc-autoaway-idle-method' :set definition.

[mwolson]

commit 1d2b5c96fa224f9551adc0556723706d02bcb0b1
Author: Diane Murray <address@hidden>
Date:   Mon Mar 12 00:01:55 2007 +0000

    Fixed a bug in the `erc-autoaway-idle-method' :set definition.
    
    * erc-autoaway.el (erc-autoaway-idle-method): When setting the new
    value, disable and re-enable `erc-autoaway-mode' only if it was
    already enabled.  This fixes a bug where autoaway was enabled just
    by loading the file.
    git-archimport-id: address@hidden/erc--main--0--patch-119

diff --git a/ChangeLog b/ChangeLog
index 8faa2b7..7bffc90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-12  Diane Murray  <address@hidden>
+
+       * erc-autoaway.el (erc-autoaway-idle-method): When setting the new
+       value, disable and re-enable `erc-autoaway-mode' only if it was
+       already enabled.  This fixes a bug where autoaway was enabled just
+       by loading the file.
+
 2007-03-10  Diane Murray  <address@hidden>
 
        * erc-capab.el: Added more information to the Usage section.
diff --git a/erc-autoaway.el b/erc-autoaway.el
index 22636a9..9c0450d 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -154,9 +154,11 @@ definitions of being idle."
                 (const :tag "Emacs idle time" emacs)
                 (const :tag "Last IRC action" irc))
   :set (lambda (sym val)
-        (erc-autoaway-disable)
-        (set-default sym val)
-        (erc-autoaway-enable)))
+        (cond (erc-autoaway-mode
+               (erc-autoaway-disable)
+               (set-default sym val)
+               (erc-autoaway-enable))
+              (t (set-default sym val)))))
 
 (defcustom erc-auto-set-away t
   "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.