2012-08-21 Josh Feinstein <jlf@foxtail.org>

* erc-join.el (erc-autojoin-timing): Fix defcustom type.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 27b1fe8617a9181a99d88fe6016b124d2b61c41e..37e755e7655bb88c33dbefddc90ac4e17ec74673 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-21  Josh Feinstein <jlf@foxtail.org>
+
+       * erc-join.el (erc-autojoin-timing): Fix defcustom type.
+
 2012-08-21  Julien Danjou  <julien@danjou.info>
 
        * erc-match.el (erc-match-message): Use

diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 85d1edf6427806c49c14ed028b8bfdf34b159829..ae7f90003a682d54add38d77862e689abe83166e 100644 (file)
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -84,8 +84,8 @@ identification, or after `erc-autojoin-delay' seconds.
 Any other value means the same as `connect'."
   :group 'erc-autojoin
   :version "24.1"
-  :type  '(choice (const :tag "On Connection" 'connect)
-                 (const :tag "When Identified" 'ident)))
+  :type  '(choice (const :tag "On Connection" connect)
+                 (const :tag "When Identified" ident)))
 
 (defcustom erc-autojoin-delay 30
   "Number of seconds to wait before attempting to autojoin channels.