diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-12-28 00:27:34 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-12-28 00:27:34 -0800 |
| commit | 946618bae3f84472c45d893e20e19b7422346370 (patch) | |
| tree | 74abb6ecae9534beaf3d847f3d401fdb392c3d2f /lisp/erc | |
| parent | 9c5a5c77000b452bdf3ee98e366d5ee6df54b5a4 (diff) | |
| download | emacs-946618bae3f84472c45d893e20e19b7422346370.tar.gz | |
Revert earlier erc-button change
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-button.el | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 46c93ccebd6..4d78421a7ab 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -2,8 +2,6 @@ * erc-log.el (erc-log-file-coding-system): Specify custom type. - * erc-button.el (erc-button-alist): Fix custom type. - 2013-11-25 Glenn Morris <rgm@gnu.org> * erc-button.el (erc-nick-popup): Make `nick' available in the diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 9b5bd50400a..69642889527 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -189,7 +189,9 @@ PAR is a number of a regexp grouping whose text will be passed to (choice :tag "Matches" regexp (variable :tag "Variable containing regexp") - (const :tag "Nicknames" nicknames)) + ;; FIXME It really does mean 'nicknames + ;; rather than just nicknames. + (const :tag "Nicknames" 'nicknames)) (integer :tag "Number of the regexp section that matches") (choice :tag "When to buttonize" (const :tag "Always" t) |