diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-02-07 01:36:17 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-02-07 01:36:17 -0500 |
| commit | 5cb9f67486056bfbc93d27dbe5611e8aa238798c (patch) | |
| tree | 747409dbf748b9cca7c128ebc1b07e30fffdf369 | |
| parent | a4cc44cf0efd240bdcd2ac9013ea0f20067ccd94 (diff) | |
| download | emacs-5cb9f67486056bfbc93d27dbe5611e8aa238798c.tar.gz emacs-5cb9f67486056bfbc93d27dbe5611e8aa238798c.tar.bz2 emacs-5cb9f67486056bfbc93d27dbe5611e8aa238798c.zip | |
* erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520).
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-services.el | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 8daf590ee89..c192b3400b4 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2010-02-07 Vivek Dasmohapatra <vivek@etla.org> + + * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). + 2010-01-25 Vivek Dasmohapatra <vivek@etla.org> * erc-backend.el (erc-session-connector): New var. diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index c917a5692b8..50a100d6932 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -303,7 +303,11 @@ The last two elements are optional." (boolean :tag "Use current nick in identify message?") (choice :tag "Command to use (optional)" (string :tag "Command") - (const :tag "No special command necessary" nil))))) + (const :tag "No special command necessary" nil)) + (choice :tag "Detect Success" + (regexp :tag "Pattern to match") + (const :tag "Do not try to detect success" nil))))) + (defsubst erc-nickserv-alist-sender (network &optional entry) (nth 1 (or entry (assoc network erc-nickserv-alist)))) |