diff options
| author | Glenn Morris | 2014-11-09 23:39:35 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-09 23:39:35 -0800 |
| commit | c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe (patch) | |
| tree | 98a77f1acdac589d1be95dea128af1af7e8dc286 /lisp/erc/erc-button.el | |
| parent | eca1ea96559e04e18a62a61208d501c557dd4cab (diff) | |
| parent | edfdb22f674312389ccf5d5e37efa4d3f1516994 (diff) | |
| download | emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.tar.gz emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.zip | |
Merge from emacs-24; up to 117698
Diffstat (limited to 'lisp/erc/erc-button.el')
| -rw-r--r-- | lisp/erc/erc-button.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 6e2c60cf6fa..b83fd9eeeb9 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el | |||
| @@ -183,7 +183,7 @@ PAR is a number of a regexp grouping whose text will be passed to | |||
| 183 | 'nicknames, these are ignored, and CALLBACK will be called with | 183 | 'nicknames, these are ignored, and CALLBACK will be called with |
| 184 | the nickname matched as the argument." | 184 | the nickname matched as the argument." |
| 185 | :group 'erc-button | 185 | :group 'erc-button |
| 186 | :version "24.3" ; remove finger (bug#4443) | 186 | :version "24.5" ; remove finger (bug#4443) |
| 187 | :type '(repeat | 187 | :type '(repeat |
| 188 | (list :tag "Button" | 188 | (list :tag "Button" |
| 189 | (choice :tag "Matches" | 189 | (choice :tag "Matches" |