diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-09-04 10:10:06 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-09-04 10:10:06 -0600 |
| commit | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (patch) | |
| tree | 3f73c47fb863ef87f420de1d30858da821072bd9 /lisp/erc/erc-join.el | |
| parent | 303324a9232dbc89369faceb6b3530740d0fc1bd (diff) | |
| parent | 6ec9a5a7b5efb129807f567709ca858211ed7840 (diff) | |
| download | emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.tar.gz | |
merge from trunk
Diffstat (limited to 'lisp/erc/erc-join.el')
| -rw-r--r-- | lisp/erc/erc-join.el | 4 |
1 files changed, 2 insertions, 2 deletions
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. |