From: Josh Feinstein <jlf@foxtail.org>
Date: Wed, 22 Aug 2012 03:45:51 +0000 (-0700)
Subject: 2012-08-21  Josh Feinstein <jlf@foxtail.org>
X-Git-Tag: emacs-24.2.90~552
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb7857924bcc4bc1a2c1cec1aa169d63447ac6f8;p=emacs.git

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 27b1fe8617a..37e755e7655 100644
--- 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 85d1edf6427..ae7f90003a6 100644
--- 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.