[Emacs-diffs] trunk r115792: Revert earlier erc-button change

[Glenn Morris]

------------------------------------------------------------
revno: 115792
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-28 00:27:34 -0800
message:
  Revert earlier erc-button change
modified:
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc-button.el         
ercbutton.el-20091113204419-o5vbwnq5f7feedwu-4314

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2013-12-28 08:21:33 +0000
+++ b/lisp/erc/ChangeLog        2013-12-28 08:27:34 +0000
@@ -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  <address@hidden>
 
        * erc-button.el (erc-nick-popup): Make `nick' available in the

=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el    2013-12-28 01:24:15 +0000
+++ b/lisp/erc/erc-button.el    2013-12-28 08:27:34 +0000
@@ -189,7 +189,9 @@
                 (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)