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 | |
| 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')
| -rw-r--r-- | lisp/erc/erc-button.el | 3 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 13 |
2 files changed, 12 insertions, 4 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))) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 4a86fa712ab..885d311cf38 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -12,7 +12,7 @@ ;; David Edmondson (dme@dme.org) ;; Michael Olson (mwolson@gnu.org) ;; Kelvin White (kwhite@gnu.org) -;; Version: 5.3 +;; Version: 5.4 ;; Package-Requires: ((emacs "27.1")) ;; Keywords: IRC, chat, client, Internet ;; URL: https://www.gnu.org/software/emacs/erc.html @@ -69,13 +69,22 @@ (require 'iso8601) (eval-when-compile (require 'subr-x)) -(defconst erc-version "5.3" +(defconst erc-version "5.4" "This version of ERC.") (defvar erc-official-location "https://www.gnu.org/software/emacs/erc.html (mailing list: emacs-erc@gnu.org)" "Location of the ERC client on the Internet.") +;; Map each :package-version to the associated Emacs version. +;; (This eliminates the need for explicit :version keywords on the +;; custom definitions.) +(add-to-list + 'customize-package-emacs-version-alist + '(ERC ("5.2" . "22.1") + ("5.3" . "23.1") + ("5.4" . "28.1"))) + (defgroup erc nil "Emacs Internet Relay Chat client." :link '(url-link "https://www.gnu.org/software/emacs/erc.html") |