diff options
author | Glenn Morris <rgm@gnu.org> | 2021-10-11 08:04:57 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2021-10-11 08:04:57 -0700 |
commit | 98f10f47a7da964d75a23f6912b35b6ef472b123 (patch) | |
tree | 330ea5d7ec33eda7412ce86097ac1e87464d8058 /lisp/erc/erc-button.el | |
parent | cc8c114b168e52dfb5a6091372c8a057b81c2f95 (diff) | |
parent | ac066088780d473f883e2afe8d178e2bf2c964fd (diff) | |
download | emacs-98f10f47a7da964d75a23f6912b35b6ef472b123.tar.gz emacs-98f10f47a7da964d75a23f6912b35b6ef472b123.tar.bz2 emacs-98f10f47a7da964d75a23f6912b35b6ef472b123.zip |
Merge from origin/emacs-28
ac06608878 (origin/emacs-28) Release ERC 5.4
a1a589d07b * etc/ERC-NEWS: Announce ERC's addition to GNU ELPA.
6c7947f0a1 * etc/ERC-NEWS: Fix outline level for the recent additions.
c480b68644 Add ERC entries for 'customize-package-emacs-version-alist'
4afff515c8 Expand the full file name
36a485a1af Obsolete XEmacs compat convention in 'erc-button-press-but...
Diffstat (limited to 'lisp/erc/erc-button.el')
-rw-r--r-- | lisp/erc/erc-button.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 17d5b6129dd..69972856d19 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -389,12 +389,11 @@ REGEXP is the regular expression which matched for this button." (mouse-set-point event) (erc-button-press-button))) -;; XEmacs calls this via widget-button-press with a bunch of arguments -;; which we don't care about. (defun erc-button-press-button (&rest _ignore) "Check text at point for a callback function. If the text at point has a `erc-callback' property, call it with the value of the `erc-data' text property." + (declare (advertised-calling-convention () "28.1")) (interactive) (let* ((data (get-text-property (point) 'erc-data)) (fun (get-text-property (point) 'erc-callback))) |