Revert earlier erc-button change

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 46c93ccebd67bd549a605618d3ab868790394de0..4d78421a7ab1ffea20fffa2ec2427547d07ca404 100644 (file)
--- 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 9b5bd50400a1da5c5946a3ed8ed9c699a4622cda..69642889527c05410bb0417c3e6467b337c701ba 100644 (file)
--- 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)